* [gentoo-commits] gentoo-x86 commit in x11-plugins/wmmsg/files: wmmsg-1.0.1-use_gtk2.patch
@ 2008-03-12 15:56 Samuli Suominen (drac)
0 siblings, 0 replies; 2+ messages in thread
From: Samuli Suominen (drac) @ 2008-03-12 15:56 UTC (permalink / raw
To: gentoo-commits
drac 08/03/12 15:56:51
Added: wmmsg-1.0.1-use_gtk2.patch
Log:
Version bump.
(Portage version: 2.1.4.4)
Revision Changes Path
1.1 x11-plugins/wmmsg/files/wmmsg-1.0.1-use_gtk2.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmmsg/files/wmmsg-1.0.1-use_gtk2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmmsg/files/wmmsg-1.0.1-use_gtk2.patch?rev=1.1&content-type=text/plain
Index: wmmsg-1.0.1-use_gtk2.patch
===================================================================
diff -ur wmmsg-1.0.1.orig/configure.in wmmsg-1.0.1/configure.in
--- wmmsg-1.0.1.orig/configure.in 2004-10-04 19:57:13.000000000 +0300
+++ wmmsg-1.0.1/configure.in 2008-03-12 17:45:29.000000000 +0200
@@ -17,11 +17,6 @@
AM_MAINTAINER_MODE
# get options
-AC_ARG_WITH(gtk,
- [ --with-gtk=DIR use gtk in <DIR>],
- [CFLAGS="$CFLAGS -I$withval/include"
- LIBS="-L$withval/lib $LIBS"])
-
AC_ARG_WITH(imlib2,
[ --with-imlib2=DIR use imlib2 in <DIR>],
[CFLAGS="$CFLAGS -I$withval/include"
@@ -32,10 +27,9 @@
AC_CHECK_LIB([m], [sin])
# Check for glib/gtk stuff
-AM_PATH_GLIB(1.2.2,,AC_MSG_ERROR([*** GLIB >= 1.2.2 not installed - please insta
-ll first ***]))
-AM_PATH_GTK(1.2.2,,AC_MSG_ERROR([*** GTK+ >= 1.2.2 not installed - please instal
-l first ***]),gthread)
+PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.0.0])
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
# check for Imlib2
AC_PATH_GENERIC(imlib2, 1.0.0, [
diff -ur wmmsg-1.0.1.orig/Makefile.am wmmsg-1.0.1/Makefile.am
--- wmmsg-1.0.1.orig/Makefile.am 2003-03-26 09:08:21.000000000 +0200
+++ wmmsg-1.0.1/Makefile.am 2008-03-12 17:42:48.000000000 +0200
@@ -3,8 +3,8 @@
bin_PROGRAMS = wmmsg wmmsg_notify
wmmsg_SOURCES = src/wmmsg/wmconfig.c src/wmmsg/wmmsg.c src/wmmsg/getopt.c src/wmgeneral/wmgeneral.c src/wmgeneral/misc.c src/wmgeneral/list.c
wmmsg_notify_SOURCES = src/wmmsg/wmmsg_notify.c src/wmmsg/getopt.c
-INCLUDES = -I/usr/X11R6/include -I$(prefix)/include -I$(includedir) -I. `glib-config --cflags` `gtk-config --cflags` `imlib2-config --cflags`
-AM_LDFLAGS = -lX11 -lXext -lXpm -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib `glib-config --libs` `gtk-config --libs` `imlib2-config --libs`
+INCLUDES = -I$(prefix)/include -I$(includedir) -I. `pkg-config --cflags gtk+-2.0` `imlib2-config --cflags`
+AM_LDFLAGS = -lX11 -lXext -lXpm -L/usr/lib -L/usr/local/lib `pkg-config --libs gtk+-2.0` `imlib2-config --libs`
man1_MANS = man/wmmsg.1 man/wmmsg_notify.1
man_MANS =
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-plugins/wmmsg/files: wmmsg-1.0.1-use_gtk2.patch
@ 2009-01-16 14:55 Michele Noberasco (s4t4n)
0 siblings, 0 replies; 2+ messages in thread
From: Michele Noberasco (s4t4n) @ 2009-01-16 14:55 UTC (permalink / raw
To: gentoo-commits
s4t4n 09/01/16 14:55:19
Modified: wmmsg-1.0.1-use_gtk2.patch
Log:
Following comments in bug #248645, cleaned up package Makefile.am.
(Portage version: 2.1.6.4/cvs/Linux 2.6.24-tuxonice-r9 i686)
Revision Changes Path
1.2 x11-plugins/wmmsg/files/wmmsg-1.0.1-use_gtk2.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmmsg/files/wmmsg-1.0.1-use_gtk2.patch?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmmsg/files/wmmsg-1.0.1-use_gtk2.patch?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-plugins/wmmsg/files/wmmsg-1.0.1-use_gtk2.patch?r1=1.1&r2=1.2
Index: wmmsg-1.0.1-use_gtk2.patch
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-plugins/wmmsg/files/wmmsg-1.0.1-use_gtk2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wmmsg-1.0.1-use_gtk2.patch 12 Mar 2008 15:56:50 -0000 1.1
+++ wmmsg-1.0.1-use_gtk2.patch 16 Jan 2009 14:55:19 -0000 1.2
@@ -30,14 +30,15 @@
diff -ur wmmsg-1.0.1.orig/Makefile.am wmmsg-1.0.1/Makefile.am
--- wmmsg-1.0.1.orig/Makefile.am 2003-03-26 09:08:21.000000000 +0200
+++ wmmsg-1.0.1/Makefile.am 2008-03-12 17:42:48.000000000 +0200
-@@ -3,8 +3,8 @@
+@@ -3,8 +3,9 @@
bin_PROGRAMS = wmmsg wmmsg_notify
wmmsg_SOURCES = src/wmmsg/wmconfig.c src/wmmsg/wmmsg.c src/wmmsg/getopt.c src/wmgeneral/wmgeneral.c src/wmgeneral/misc.c src/wmgeneral/list.c
wmmsg_notify_SOURCES = src/wmmsg/wmmsg_notify.c src/wmmsg/getopt.c
-INCLUDES = -I/usr/X11R6/include -I$(prefix)/include -I$(includedir) -I. `glib-config --cflags` `gtk-config --cflags` `imlib2-config --cflags`
-AM_LDFLAGS = -lX11 -lXext -lXpm -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib `glib-config --libs` `gtk-config --libs` `imlib2-config --libs`
+INCLUDES = -I$(prefix)/include -I$(includedir) -I. `pkg-config --cflags gtk+-2.0` `imlib2-config --cflags`
-+AM_LDFLAGS = -lX11 -lXext -lXpm -L/usr/lib -L/usr/local/lib `pkg-config --libs gtk+-2.0` `imlib2-config --libs`
++wmmsg_LDADD = -lX11 -lXext -lXpm -L/usr/lib -L/usr/local/lib $(GTK_LIBS) $(IMLIB_LIBS)
++wmmsg_notify_LDADD = $(wmmsg_LDADD)
man1_MANS = man/wmmsg.1 man/wmmsg_notify.1
man_MANS =
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-01-16 14:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-12 15:56 [gentoo-commits] gentoo-x86 commit in x11-plugins/wmmsg/files: wmmsg-1.0.1-use_gtk2.patch Samuli Suominen (drac)
-- strict thread matches above, loose matches on Subject: below --
2009-01-16 14:55 Michele Noberasco (s4t4n)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox