* [gentoo-commits] gentoo-x86 commit in media-sound/glurp/files: glurp-0.11.6-system_libmpd.patch
@ 2009-06-08 15:04 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 5+ messages in thread
From: Samuli Suominen (ssuominen) @ 2009-06-08 15:04 UTC (permalink / raw
To: gentoo-commits
ssuominen 09/06/08 15:04:37
Modified: glurp-0.11.6-system_libmpd.patch
Log:
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.
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Revision Changes Path
1.4 media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch
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
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
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
Index: glurp-0.11.6-system_libmpd.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- glurp-0.11.6-system_libmpd.patch 2 Jun 2009 10:01:25 -0000 1.3
+++ glurp-0.11.6-system_libmpd.patch 8 Jun 2009 15:04:37 -0000 1.4
@@ -1,20 +1,42 @@
diff -ur glurp-0.11.6.orig/configure.in glurp-0.11.6/configure.in
--- glurp-0.11.6.orig/configure.in 2005-06-05 18:23:54.000000000 +0300
-+++ glurp-0.11.6/configure.in 2009-06-01 22:14:13.000000000 +0300
-@@ -35,7 +35,7 @@
- ])
-
- #pkg_modules="gtk+-2.0 libglade-2.0 libxml-2.0 glib-2.0"
--pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 libglade-2.0 >= 2.3 gmodule-2.0 >= 2.6"
-+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"
- PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
++++ glurp-0.11.6/configure.in 2009-06-08 17:58:20.000000000 +0300
+@@ -40,6 +40,10 @@
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
-Only in glurp-0.11.6.orig/src: libmpdclient.c
-Only in glurp-0.11.6.orig/src: libmpdclient.h
+
++PKG_CHECK_MODULES([libmpd], libmpd >= 0.17.0)
++AC_SUBST(libmpd_LIBS)
++AC_SUBST(libmpd_CFLAGS)
++
+ dnl AC_SUBST(GETTEXT_PACKAGE)
+ dnl AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"glurp")
+
+Only in glurp-0.11.6.orig: glurp-0.11.6
+diff -ur glurp-0.11.6.orig/src/libmpdclient.c glurp-0.11.6/src/libmpdclient.c
+--- glurp-0.11.6.orig/src/libmpdclient.c 2005-04-03 04:56:08.000000000 +0300
++++ glurp-0.11.6/src/libmpdclient.c 2009-06-08 18:02:29.000000000 +0300
+@@ -31,7 +31,7 @@
+
+ */
+
+-#include "libmpdclient.h"
++#include <libmpd/libmpdclient.h>
+
+ #include <errno.h>
+ #include <sys/types.h>
diff -ur glurp-0.11.6.orig/src/Makefile.am glurp-0.11.6/src/Makefile.am
--- glurp-0.11.6.orig/src/Makefile.am 2005-06-05 18:28:03.000000000 +0300
-+++ glurp-0.11.6/src/Makefile.am 2009-06-01 22:13:07.000000000 +0300
++++ glurp-0.11.6/src/Makefile.am 2009-06-08 17:59:27.000000000 +0300
+@@ -2,7 +2,7 @@
+
+ INCLUDES = \
+ -DDATADIR=\""$(datadir)/glurp/"\" \
+- @PACKAGE_CFLAGS@ -Wall
++ @PACKAGE_CFLAGS@ @libmpd_CFLAGS@ -Wall
+
+ bin_PROGRAMS = glurp
+
@@ -12,7 +12,6 @@
gui.h gui.c \
gui-callbacks.c \
@@ -23,15 +45,21 @@
main.c \
player.h player.c \
structs.h \
+@@ -20,4 +19,4 @@
+
+ glurp_LDFLAGS = -export-dynamic
+
+-glurp_LDADD = @PACKAGE_LIBS@
++glurp_LDADD = @PACKAGE_LIBS@ @libmpd_LIBS@
diff -ur glurp-0.11.6.orig/src/structs.h glurp-0.11.6/src/structs.h
--- glurp-0.11.6.orig/src/structs.h 2005-04-05 04:35:39.000000000 +0300
-+++ glurp-0.11.6/src/structs.h 2009-06-01 22:45:09.000000000 +0300
++++ glurp-0.11.6/src/structs.h 2009-06-08 18:02:10.000000000 +0300
@@ -20,7 +20,7 @@
*/
-#include "libmpdclient.h"
-+#include <libmpdclient.h>
++#include <libmpd/libmpdclient.h>
enum {
PL_FILENAME,
^ permalink raw reply [flat|nested] 5+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-sound/glurp/files: glurp-0.11.6-system_libmpd.patch
@ 2011-12-11 21:23 Tim Harder (radhermit)
0 siblings, 0 replies; 5+ messages in thread
From: Tim Harder (radhermit) @ 2011-12-11 21:23 UTC (permalink / raw
To: gentoo-commits
radhermit 11/12/11 21:23:08
Removed: glurp-0.11.6-system_libmpd.patch
Log:
Remove old.
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-sound/glurp/files: glurp-0.11.6-system_libmpd.patch
@ 2009-06-02 10:01 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 5+ messages in thread
From: Samuli Suominen (ssuominen) @ 2009-06-02 10:01 UTC (permalink / raw
To: gentoo-commits
ssuominen 09/06/02 10:01:25
Modified: glurp-0.11.6-system_libmpd.patch
Log:
Fix yesterdays typing error for libmpd versioning.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Revision Changes Path
1.3 media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch?r1=1.2&r2=1.3
Index: glurp-0.11.6-system_libmpd.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- glurp-0.11.6-system_libmpd.patch 1 Jun 2009 19:45:45 -0000 1.2
+++ glurp-0.11.6-system_libmpd.patch 2 Jun 2009 10:01:25 -0000 1.3
@@ -6,7 +6,7 @@
#pkg_modules="gtk+-2.0 libglade-2.0 libxml-2.0 glib-2.0"
-pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 libglade-2.0 >= 2.3 gmodule-2.0 >= 2.6"
-+pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 libglade-2.0 >= 2.3 gmodule-2.0 >= 2.6 libmpd >= 0.18.0"
++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"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
^ permalink raw reply [flat|nested] 5+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-sound/glurp/files: glurp-0.11.6-system_libmpd.patch
@ 2009-06-01 19:45 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 5+ messages in thread
From: Samuli Suominen (ssuominen) @ 2009-06-01 19:45 UTC (permalink / raw
To: gentoo-commits
ssuominen 09/06/01 19:45:45
Modified: glurp-0.11.6-system_libmpd.patch
Log:
Fix previous commit, it was still using the bundled include. Now playlist actually works.. nice.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Revision Changes Path
1.2 media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch?r1=1.1&r2=1.2
Index: glurp-0.11.6-system_libmpd.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- glurp-0.11.6-system_libmpd.patch 1 Jun 2009 19:22:17 -0000 1.1
+++ glurp-0.11.6-system_libmpd.patch 1 Jun 2009 19:45:45 -0000 1.2
@@ -6,7 +6,7 @@
#pkg_modules="gtk+-2.0 libglade-2.0 libxml-2.0 glib-2.0"
-pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 libglade-2.0 >= 2.3 gmodule-2.0 >= 2.6"
-+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"
++pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 libglade-2.0 >= 2.3 gmodule-2.0 >= 2.6 libmpd >= 0.18.0"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
@@ -23,3 +23,15 @@
main.c \
player.h player.c \
structs.h \
+diff -ur glurp-0.11.6.orig/src/structs.h glurp-0.11.6/src/structs.h
+--- glurp-0.11.6.orig/src/structs.h 2005-04-05 04:35:39.000000000 +0300
++++ glurp-0.11.6/src/structs.h 2009-06-01 22:45:09.000000000 +0300
+@@ -20,7 +20,7 @@
+
+ */
+
+-#include "libmpdclient.h"
++#include <libmpdclient.h>
+
+ enum {
+ PL_FILENAME,
^ permalink raw reply [flat|nested] 5+ messages in thread* [gentoo-commits] gentoo-x86 commit in media-sound/glurp/files: glurp-0.11.6-system_libmpd.patch
@ 2009-06-01 19:22 Samuli Suominen (ssuominen)
0 siblings, 0 replies; 5+ messages in thread
From: Samuli Suominen (ssuominen) @ 2009-06-01 19:22 UTC (permalink / raw
To: gentoo-commits
ssuominen 09/06/01 19:22:18
Added: glurp-0.11.6-system_libmpd.patch
Log:
Use system libmpd #255771.
(Portage version: 2.1.6.13/cvs/Linux x86_64, RepoMan options: --force)
Revision Changes Path
1.1 media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/glurp/files/glurp-0.11.6-system_libmpd.patch?rev=1.1&content-type=text/plain
Index: glurp-0.11.6-system_libmpd.patch
===================================================================
diff -ur glurp-0.11.6.orig/configure.in glurp-0.11.6/configure.in
--- glurp-0.11.6.orig/configure.in 2005-06-05 18:23:54.000000000 +0300
+++ glurp-0.11.6/configure.in 2009-06-01 22:14:13.000000000 +0300
@@ -35,7 +35,7 @@
])
#pkg_modules="gtk+-2.0 libglade-2.0 libxml-2.0 glib-2.0"
-pkg_modules="gtk+-2.0 >= 2.4 glib-2.0 >= 2.4 libglade-2.0 >= 2.3 gmodule-2.0 >= 2.6"
+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"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
Only in glurp-0.11.6.orig/src: libmpdclient.c
Only in glurp-0.11.6.orig/src: libmpdclient.h
diff -ur glurp-0.11.6.orig/src/Makefile.am glurp-0.11.6/src/Makefile.am
--- glurp-0.11.6.orig/src/Makefile.am 2005-06-05 18:28:03.000000000 +0300
+++ glurp-0.11.6/src/Makefile.am 2009-06-01 22:13:07.000000000 +0300
@@ -12,7 +12,6 @@
gui.h gui.c \
gui-callbacks.c \
keyboard.c \
- libmpdclient.h libmpdclient.c \
main.c \
player.h player.c \
structs.h \
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-12-11 21:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-08 15:04 [gentoo-commits] gentoo-x86 commit in media-sound/glurp/files: glurp-0.11.6-system_libmpd.patch Samuli Suominen (ssuominen)
-- strict thread matches above, loose matches on Subject: below --
2011-12-11 21:23 Tim Harder (radhermit)
2009-06-02 10:01 Samuli Suominen (ssuominen)
2009-06-01 19:45 Samuli Suominen (ssuominen)
2009-06-01 19:22 Samuli Suominen (ssuominen)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox