| 1 |
ssuominen 09/06/08 15:04:37 |
| 2 |
|
| 3 |
Modified: glurp-0.11.6-system_libmpd.patch |
| 4 |
Log: |
| 5 |
Fix my system libmpd patch in a form that is acceptable also for upstream, if I get them convinced to release one more version of this dead application. |
| 6 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: glurp-0.11.6-system_libmpd.patch |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- glurp-0.11.6-system_libmpd.patch 2 Jun 2009 10:01:25 -0000 1.3 |
| 22 |
+++ glurp-0.11.6-system_libmpd.patch 8 Jun 2009 15:04:37 -0000 1.4 |
| 23 |
@@ -1,20 +1,42 @@ |
| 24 |
diff -ur glurp-0.11.6.orig/configure.in glurp-0.11.6/configure.in |
| 25 |
--- glurp-0.11.6.orig/configure.in 2005-06-05 18:23:54.000000000 +0300 |
| 26 |
-+++ glurp-0.11.6/configure.in 2009-06-01 22:14:13.000000000 +0300 |
| 27 |
-@@ -35,7 +35,7 @@ |
| 28 |
- ]) |
| 29 |
- |
| 30 |
- #pkg_modules="gtk+-2.0 libglade-2.0 libxml-2.0 glib-2.0" |
| 31 |
--pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 libglade-2.0 >= 2.3 gmodule-2.0 >= 2.6" |
| 32 |
-+pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 libglade-2.0 >= 2.3 gmodule-2.0 >= 2.6 libmpd >= 0.17.0" |
| 33 |
- PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) |
| 34 |
++++ glurp-0.11.6/configure.in 2009-06-08 17:58:20.000000000 +0300 |
| 35 |
+@@ -40,6 +40,10 @@ |
| 36 |
AC_SUBST(PACKAGE_CFLAGS) |
| 37 |
AC_SUBST(PACKAGE_LIBS) |
| 38 |
-Only in glurp-0.11.6.orig/src: libmpdclient.c |
| 39 |
-Only in glurp-0.11.6.orig/src: libmpdclient.h |
| 40 |
+ |
| 41 |
++PKG_CHECK_MODULES([libmpd], libmpd >= 0.17.0) |
| 42 |
++AC_SUBST(libmpd_LIBS) |
| 43 |
++AC_SUBST(libmpd_CFLAGS) |
| 44 |
++ |
| 45 |
+ dnl AC_SUBST(GETTEXT_PACKAGE) |
| 46 |
+ dnl AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"glurp") |
| 47 |
+ |
| 48 |
+Only in glurp-0.11.6.orig: glurp-0.11.6 |
| 49 |
+diff -ur glurp-0.11.6.orig/src/libmpdclient.c glurp-0.11.6/src/libmpdclient.c |
| 50 |
+--- glurp-0.11.6.orig/src/libmpdclient.c 2005-04-03 04:56:08.000000000 +0300 |
| 51 |
++++ glurp-0.11.6/src/libmpdclient.c 2009-06-08 18:02:29.000000000 +0300 |
| 52 |
+@@ -31,7 +31,7 @@ |
| 53 |
+ |
| 54 |
+ */ |
| 55 |
+ |
| 56 |
+-#include "libmpdclient.h" |
| 57 |
++#include <libmpd/libmpdclient.h> |
| 58 |
+ |
| 59 |
+ #include <errno.h> |
| 60 |
+ #include <sys/types.h> |
| 61 |
diff -ur glurp-0.11.6.orig/src/Makefile.am glurp-0.11.6/src/Makefile.am |
| 62 |
--- glurp-0.11.6.orig/src/Makefile.am 2005-06-05 18:28:03.000000000 +0300 |
| 63 |
-+++ glurp-0.11.6/src/Makefile.am 2009-06-01 22:13:07.000000000 +0300 |
| 64 |
++++ glurp-0.11.6/src/Makefile.am 2009-06-08 17:59:27.000000000 +0300 |
| 65 |
+@@ -2,7 +2,7 @@ |
| 66 |
+ |
| 67 |
+ INCLUDES = \ |
| 68 |
+ -DDATADIR=\""$(datadir)/glurp/"\" \ |
| 69 |
+- @PACKAGE_CFLAGS@ -Wall |
| 70 |
++ @PACKAGE_CFLAGS@ @libmpd_CFLAGS@ -Wall |
| 71 |
+ |
| 72 |
+ bin_PROGRAMS = glurp |
| 73 |
+ |
| 74 |
@@ -12,7 +12,6 @@ |
| 75 |
gui.h gui.c \ |
| 76 |
gui-callbacks.c \ |
| 77 |
@@ -23,15 +45,21 @@ |
| 78 |
main.c \ |
| 79 |
player.h player.c \ |
| 80 |
structs.h \ |
| 81 |
+@@ -20,4 +19,4 @@ |
| 82 |
+ |
| 83 |
+ glurp_LDFLAGS = -export-dynamic |
| 84 |
+ |
| 85 |
+-glurp_LDADD = @PACKAGE_LIBS@ |
| 86 |
++glurp_LDADD = @PACKAGE_LIBS@ @libmpd_LIBS@ |
| 87 |
diff -ur glurp-0.11.6.orig/src/structs.h glurp-0.11.6/src/structs.h |
| 88 |
--- glurp-0.11.6.orig/src/structs.h 2005-04-05 04:35:39.000000000 +0300 |
| 89 |
-+++ glurp-0.11.6/src/structs.h 2009-06-01 22:45:09.000000000 +0300 |
| 90 |
++++ glurp-0.11.6/src/structs.h 2009-06-08 18:02:10.000000000 +0300 |
| 91 |
@@ -20,7 +20,7 @@ |
| 92 |
|
| 93 |
*/ |
| 94 |
|
| 95 |
-#include "libmpdclient.h" |
| 96 |
-+#include <libmpdclient.h> |
| 97 |
++#include <libmpd/libmpdclient.h> |
| 98 |
|
| 99 |
enum { |
| 100 |
PL_FILENAME, |
Archives