[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmenu/files/

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmenu/files/

[David Seifert]

commit:     d5de1aaf993dde2408705825bfc25871274f3c69
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Feb 18 15:44:12 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 22:07:13 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5de1aaf

x11-plugins/wmmenu: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/4014

 x11-plugins/wmmenu/files/wmmenu-1.2-Makefile.patch | 32 ----------------------
 .../wmmenu-1.2-support-libdockapp-0.5.0.patch      | 14 ----------
 2 files changed, 46 deletions(-)

diff --git a/x11-plugins/wmmenu/files/wmmenu-1.2-Makefile.patch b/x11-plugins/wmmenu/files/wmmenu-1.2-Makefile.patch
deleted file mode 100644
index 766f9c672f..0000000000
--- a/x11-plugins/wmmenu/files/wmmenu-1.2-Makefile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- wmmenu/Makefile~	2002-03-23 07:51:36 -0500
-+++ wmmenu/Makefile	2004-12-16 19:44:36 -0500
-@@ -4,7 +4,7 @@
- ETCDIR = $(prefix)/etc
- 
- # comment out both lines to get the old, Xpm-only, version
--GDKPIXBUF = 1
-+#GDKPIXBUF = 1
- #GDKPIXBUF2 = 1
- 
- XROOT = /usr/X11R6
-@@ -19,17 +19,17 @@
- 
- # If you want to use gdk-pixbuf-2.0, pass GDKPIXBUF2=1 to make command
- ifdef GDKPIXBUF2
--PIXBUF_CFG = /opt/gtk2/bin/pkg-config gdk-pixbuf-xlib-2.0
-+PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0
- PIXBUF_DEF = -DWITH_GDKPIXBUF
- PIXBUF_INC := $(shell $(PIXBUF_CFG) --cflags)
- PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0
- endif
- 
- CC = gcc #-g
--CFLAGS = -pipe $(CPPFLAGS) -O2
-+CFLAGS = $(CPPFLAGS) ${EXTRACFLAGS}
- CPPFLAGS = -MMD -ansi -pedantic -Wall $(INCDIRS) $(DEFINES)
- INCDIRS = -I$(DAROOT)/include -I$(XROOT)/include $(PIXBUF_INC)
- DEFINES = -DETCDIR='"$(ETCDIR)"' $(PIXBUF_DEF)
--LDFLAGS = -s
-+#LDFLAGS = -s
- LIBDIRS = -L$(DAROOT)/lib -L$(XROOT)/lib $(PIXBUF_LIB)
- LDLIBS = -ldockapp -lXpm -lXext -lX11 -lm

diff --git a/x11-plugins/wmmenu/files/wmmenu-1.2-support-libdockapp-0.5.0.patch b/x11-plugins/wmmenu/files/wmmenu-1.2-support-libdockapp-0.5.0.patch
deleted file mode 100644
index ffc8d274ec..0000000000
--- a/x11-plugins/wmmenu/files/wmmenu-1.2-support-libdockapp-0.5.0.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- wmmenu/wmmenu.c~	2002-03-10 05:41:12 -0500
-+++ wmmenu/wmmenu.c	2004-12-16 18:30:52 -0500
-@@ -18,8 +18,9 @@
- 
-     DAParseArguments (Options_Argc, Options_Argv, NULL, 0,
-         "wmmenu", VERSION) ;
--    DAInitialize (NULL, (char*)Menu_GetTitle (), 48, 48, argc, argv) ;
--
-+    DAOpenDisplay (NULL, argc, argv) ;
-+    DACreateIcon((char*)Menu_GetTitle (), 48, 48, argc, argv);
-+    
-     Pixmaps_LoadMenu () ;
-     Pixmaps_LoadTile () ;
-     /* needs tile to be loaded before to have autoscale work */

[gentoo-commits] repo/gentoo:master commit in: x11-plugins/wmmenu/files/

[Bernard Cafarelli]

commit:     90c3a62f8d5ae2cdca002f80c5c403ee0b0f0471
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 10 14:03:10 2022 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Jul 10 14:03:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90c3a62f

x11-plugins/wmmenu: update makefile patch to also fix link command line

Bug: https://bugs.gentoo.org/743082
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>

 x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch b/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch
index bbf18433480c..7e41b40d2f04 100644
--- a/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch
+++ b/x11-plugins/wmmenu/files/wmmenu-1.3-Makefile.patch
@@ -1,7 +1,12 @@
---- a/Makefile	2015-04-17 13:43:08.122972280 +0200
-+++ b/Makefile	2015-04-17 13:43:11.569975854 +0200
-@@ -14,12 +14,12 @@
- PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2015-04-17 13:36:16.000000000 +0200
++++ b/Makefile	2022-07-10 16:02:05.686255330 +0200
+@@ -11,15 +11,15 @@
+ PIXBUF_CFG = pkg-config gdk-pixbuf-xlib-2.0
+ PIXBUF_DEF = -DWITH_GDKPIXBUF
+ PIXBUF_INC := $(shell $(PIXBUF_CFG) --cflags)
+-PIXBUF_LIB := -rdynamic -L$(shell $(PIXBUF_CFG) --variable=prefix)/lib -lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0
++PIXBUF_LIB := -rdynamic -lgdk_pixbuf_xlib-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0
  endif
  
 -CC = gcc #-g