Packman Build Service PMBS

selene.changes Changed

selene.spec Changed

selene-fix-makefile.patch Changed

@@ -1,33 +1,33 @@
 --- a/src/makefile
 +++ b/src/makefile
-@@ -1,20 +1,23 @@
- prefix=/usr
+@@ -1,20 +1,21 @@
+-prefix=/usr
++prefix?=/usr
  bindir=$(prefix)/bin
  sharedir=$(prefix)/share
-+ifndef libdir
-+libdir=$(prefix)/lib
-+endif
++libdir?=$(prefix)/lib
  localedir=$(sharedir)/locale
  launcherdir=$(sharedir)/applications
  mandir=$(sharedir)/man
  man1dir=$(mandir)/man1
 -CFLAGS=--std=c99
-+CFLAGS+=--std=c99
++CFLAGS+=--Wall -std=c99
++LDFLAGS+=-lm
  app_name=selene
  app_fullname=Selene
  
  all:
  	#build binaries
 -	valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" -X -Wl,-rpath,/usr/share/${app_name}/libs "Main.vala" "Utility.vala" "MainWindow.vala" "AppConfigWindow.vala" "EncoderConfigWindow.vala" "EncoderStatusWindow.vala" "FileInfoWindow.vala" "AboutWindow.vala" "DonationWindow.vala" "CustomMessageDialog.vala" "SimpleProgressWindow.vala" "ColumnSelectionDialog.vala" "BatchEditWindow.vala" "MediaFile.vala" "MediaPlayer.vala" "ScriptFile.vala" "MediaPlayerWindow.vala" "XidHelper.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-0.8 --pkg json-glib-1.0 --pkg gdk-x11-3.0
-+	valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" -X -Wl,-rpath,"$(libdir)/${app_name}" "Main.vala" "Utility.vala" "MainWindow.vala" "AppConfigWindow.vala" "EncoderConfigWindow.vala" "EncoderStatusWindow.vala" "FileInfoWindow.vala" "AboutWindow.vala" "DonationWindow.vala" "CustomMessageDialog.vala" "SimpleProgressWindow.vala" "ColumnSelectionDialog.vala" "BatchEditWindow.vala" "MediaFile.vala" "MediaPlayer.vala" "ScriptFile.vala" "MediaPlayerWindow.vala" "XidHelper.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-0.8 --pkg json-glib-1.0 --pkg gdk-x11-3.0
- 	#--pkg gdk-x11-3.0
+-	#--pkg gdk-x11-3.0
++	valac -X -D'GETTEXT_PACKAGE="${app_name}"' $(foreach FLAG,$(CFLAGS) $(LDFLAGS),"--Xcc=$(FLAG)") -X -Wl,-rpath,"$(libdir)/${app_name}" "Main.vala" "Utility.vala" "MainWindow.vala" "AppConfigWindow.vala" "EncoderConfigWindow.vala" "EncoderStatusWindow.vala" "FileInfoWindow.vala" "AboutWindow.vala" "DonationWindow.vala" "CustomMessageDialog.vala" "SimpleProgressWindow.vala" "ColumnSelectionDialog.vala" "BatchEditWindow.vala" "MediaFile.vala" "MediaPlayer.vala" "ScriptFile.vala" "MediaPlayerWindow.vala" "XidHelper.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-0.8 --pkg json-glib-1.0 --pkg gdk-x11-3.0
  
 -	#valac -X -D'GETTEXT_PACKAGE=ffmpeg-builder' --Xcc="-lm" -X -Wl,-rpath,/usr/share/${app_name}/libs "Main.vala" "Utility.vala" "FFmpegBuilder.vala" "CustomMessageDialog.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-0.8 --pkg json-glib-1.0 --pkg libvte
-+	#valac -X -D'GETTEXT_PACKAGE=ffmpeg-builder' --Xcc="-lm" -X -Wl,-rpath,"$(libdir)/${app_name}" "Main.vala" "Utility.vala" "FFmpegBuilder.vala" "CustomMessageDialog.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-0.8 --pkg json-glib-1.0 --pkg libvte
++	#valac -X -D'GETTEXT_PACKAGE=ffmpeg-builder' $(foreach FLAG,$(CFLAGS) $(LDFLAGS),"--Xcc=$(FLAG)") -X -Wl,-rpath,"$(libdir)/${app_name}" "Main.vala" "Utility.vala" "FFmpegBuilder.vala" "CustomMessageDialog.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-0.8 --pkg json-glib-1.0 --pkg libvte
  
  	#update translation template
  	xgettext --language=C --keyword=_ --copyright-holder='Tony George (teejee2008@gmail.com)' --package-name='${app_name}' --package-version='2.2' --msgid-bugs-address='teejee2008@gmail.com' --escape --sort-output -o ../${app_name}.pot *.vala
-@@ -25,6 +28,7 @@ clean:
+@@ -25,6 +26,7 @@ clean:
  install:
  	mkdir -p "$(DESTDIR)$(bindir)"
  	mkdir -p "$(DESTDIR)$(sharedir)"
@@ -35,7 +35,7 @@
  	mkdir -p "$(DESTDIR)$(mandir)"
  	mkdir -p "$(DESTDIR)$(man1dir)"
  	mkdir -p "$(DESTDIR)$(launcherdir)"
-@@ -38,7 +42,8 @@ install:
+@@ -38,7 +40,8 @@ install:
  
  	#shared files
  	cp -dpr --no-preserve=ownership -t "$(DESTDIR)$(sharedir)/${app_name}" ./share/${app_name}/*
@@ -45,7 +45,7 @@
  
  	#launcher
  	install -m 0755 ${app_name}.desktop "$(DESTDIR)$(launcherdir)"
-@@ -63,6 +68,7 @@ uninstall:
+@@ -63,6 +66,7 @@ uninstall:
  
  	#shared files
  	rm -rf "$(DESTDIR)$(sharedir)/${app_name}"

Changes of Revision 13