| 1 |
hasufell 12/05/31 16:09:45 |
| 2 |
|
| 3 |
Added: quark-3.24-build.patch |
| 4 |
Log: |
| 5 |
version bump |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 media-sound/quark/files/quark-3.24-build.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/quark/files/quark-3.24-build.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/quark/files/quark-3.24-build.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: quark-3.24-build.patch |
| 16 |
=================================================================== |
| 17 |
From: Julian Ospald <hasufell@g.o> |
| 18 |
Date: Thu May 31 13:46:18 UTC 2012 |
| 19 |
Subject: build system |
| 20 |
|
| 21 |
fix underlinking ( https://bugs.gentoo.org/show_bug.cgi?id=367859 ) |
| 22 |
remove DEPRECATED flags ( https://bugs.gentoo.org/show_bug.cgi?id=387823 ) |
| 23 |
fix permissions on schema files |
| 24 |
make icondir modifiable |
| 25 |
|
| 26 |
--- configure.ac |
| 27 |
+++ configure.ac |
| 28 |
@@ -41,6 +41,10 @@ |
| 29 |
AC_SUBST(GTHREAD_CFLAGS) |
| 30 |
AC_SUBST(GTHREAD_LIBS) |
| 31 |
|
| 32 |
+PKG_CHECK_MODULES(X11, [x11]) |
| 33 |
+AC_SUBST(X11_CFLAGS) |
| 34 |
+AC_SUBST(X11_LIBS) |
| 35 |
+ |
| 36 |
AC_ARG_ENABLE(gconf, |
| 37 |
[ --disable-gconf disable use of gconf (for embedded targets)], |
| 38 |
[], [enable_gconf="yes"]) |
| 39 |
@@ -64,6 +68,13 @@ |
| 40 |
fi |
| 41 |
AM_CONDITIONAL(USE_GCONF, test "$enable_gconf" = "yes") |
| 42 |
|
| 43 |
+AC_ARG_WITH([icondir], |
| 44 |
+ [AC_HELP_STRING([--with-icondir=DIR], |
| 45 |
+ [where icon gets installed to (default: datadir/pixmaps)])], |
| 46 |
+ [icondir="$withval"], |
| 47 |
+ [icondir="$datadir/pixmaps"]) |
| 48 |
+AC_SUBST(icondir) |
| 49 |
+ |
| 50 |
AC_CONFIG_HEADERS([config.h]) |
| 51 |
AC_CONFIG_FILES([ |
| 52 |
Makefile |
| 53 |
--- quark/Makefile.am |
| 54 |
+++ quark/Makefile.am |
| 55 |
@@ -1,7 +1,6 @@ |
| 56 |
localedir=$(datadir)/locale |
| 57 |
|
| 58 |
AM_CPPFLAGS=$(GLIB_CFLAGS) $(GTHREAD_CFLAGS) $(GNOMEVFS_CFLAGS) $(GCONF_CFLAGS) $(XINE_CFLAGS) \ |
| 59 |
- -DG_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED \ |
| 60 |
-DLOCALEDIR=\"$(localedir)\" |
| 61 |
|
| 62 |
bin_PROGRAMS = quark |
| 63 |
@@ -30,7 +29,7 @@ |
| 64 |
gconftool-2 --makefile-install-rule $< |
| 65 |
endif |
| 66 |
$(INSTALL) -d $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR) |
| 67 |
- $(INSTALL) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR) |
| 68 |
+ $(INSTALL_DATA) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR) |
| 69 |
|
| 70 |
uninstall-local: |
| 71 |
$(RM) $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/quark.schemas |
| 72 |
--- strange-quark/Makefile.am |
| 73 |
+++ strange-quark/Makefile.am |
| 74 |
@@ -6,14 +6,13 @@ |
| 75 |
$(GTK_CFLAGS) \ |
| 76 |
$(GCONF_CFLAGS) \ |
| 77 |
$(GDK_PIXBUF_CFLAGS) \ |
| 78 |
- -DG_DISABLE_DEPRECATED \ |
| 79 |
-DG_LOG_DOMAIN=\"strange-quark\" \ |
| 80 |
- -DPIXMAPDIR=\"$(pixmapdir)\" \ |
| 81 |
+ -DPIXMAPDIR=\"$(icondir)\" \ |
| 82 |
-DLOCALEDIR=\"$(localedir)\" |
| 83 |
|
| 84 |
bin_PROGRAMS = strange-quark |
| 85 |
|
| 86 |
-strange_quark_LDADD = $(GTK_LIBS) $(GCONF_LIBS) |
| 87 |
+strange_quark_LDADD = $(GTK_LIBS) $(GCONF_LIBS) $(X11_LIBS) |
| 88 |
strange_quark_SOURCES = \ |
| 89 |
gettext.h \ |
| 90 |
main.c \ |
| 91 |
@@ -43,7 +42,7 @@ |
| 92 |
gconftool-2 --makefile-install-rule $< |
| 93 |
endif |
| 94 |
$(INSTALL) -d $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR) |
| 95 |
- $(INSTALL) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR) |
| 96 |
+ $(INSTALL_DATA) $< $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR) |
| 97 |
|
| 98 |
uninstall-local: |
| 99 |
$(RM) $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/strange-quark.schemas |
| 100 |
--- pixmaps/Makefile.am |
| 101 |
+++ pixmaps/Makefile.am |
| 102 |
@@ -1,8 +1,5 @@ |
| 103 |
-pixmapdir = $(datadir)/pixmaps |
| 104 |
- |
| 105 |
-pixmap_DATA = \ |
| 106 |
- quark.png \ |
| 107 |
- quark48.png |
| 108 |
+icon_DATA = \ |
| 109 |
+ quark.png |
| 110 |
|
| 111 |
EXTRA_DIST = \ |
| 112 |
quark.png \ |
| 113 |
--- strange-quark/quark.desktop |
| 114 |
+++ strange-quark/quark.desktop |
| 115 |
@@ -3,7 +3,7 @@ |
| 116 |
Name=Quark Music Player |
| 117 |
Comment=Play music from the system tray |
| 118 |
Exec=strange-quark |
| 119 |
-Icon=quark48.png |
| 120 |
+Icon=quark.png |
| 121 |
Terminal=false |
| 122 |
Type=Application |
| 123 |
Categories=Application;AudioVideo; |
Archives