[gentoo-commits] gentoo-x86 commit in x11-plugins/bubblemon/files: bubblemon-1.46-gtk.patch bubblemon-1.46-no_display.patch bubblemon-1.46-asneeded.patch

[Samuli Suominen (ssuominen)]

ssuominen    11/12/03 16:01:52

  Added:                bubblemon-1.46-gtk.patch
                        bubblemon-1.46-no_display.patch
                        bubblemon-1.46-asneeded.patch
  Log:
  Move from x11-misc to x11-plugins. Delete the SLOT with dependency of (conflicting) libpanelapplet-2.0.
  
  (Portage version: 2.2.0_alpha79/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/bubblemon/files/bubblemon-1.46-gtk.patch?rev=1.1&content-type=text/plain

Index: bubblemon-1.46-gtk.patch
===================================================================
--- bubblemon.c
+++ bubblemon.c
@@ -58,6 +58,7 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <X11/Xresource.h>
+#include <gtk/gtk.h>
 
 #include "include/master.xpm"
 #include "include/bubblemon.h"
@@ -575,7 +576,7 @@
     attri.colormap = gdk_colormap_get_system();
     attri.wmclass_name = "bubblemon";
     attri.wmclass_class = "bubblemon";
-    attri.window_type = GDK_WINDOW_TOPLEVEL;
+    attri.window_type = GDK_WINDOW_CHILD;
 
     bm.iconwin = gdk_window_new(bm.win, &attri,
 				GDK_WA_TITLE | GDK_WA_WMCLASS);
@@ -593,7 +594,6 @@
     wmhints.window_group = win;
     wmhints.flags =
 	StateHint | IconWindowHint | IconPositionHint | WindowGroupHint;
-    XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
 
     bm.gc = gdk_gc_new(bm.win);
 
@@ -606,6 +606,7 @@
     gdk_window_set_back_pixmap(bm.iconwin, bm.pixmap, False);
 
     gdk_window_show(bm.win);
+    XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
 #ifdef KDE_DOCKAPP
     /* makes the dockapp visible inside KDE wm */
     gdk_window_show(bm.iconwin);
--- Makefile
+++ Makefile
@@ -11,30 +11,49 @@
 
 # no user serviceable parts below
 EXTRA += $(WMAN)
+# gtk cflags and gtk lib flags
+GTK2_CFLAGS = $(shell pkg-config gtk+-2.0 --cflags)
+GTK2_LIBS = $(shell pkg-config gtk+-2.0 --libs)
+
+
 # optimization cflags
-CFLAGS = -O3 -ansi -Wall `gtk-config --cflags` ${EXTRA}
+#CFLAGS = -O3 -Wall ${EXTRA}
+CFLAGS = ${GENTOO_CFLAGS} ${EXTRA}
+
 # profiling cflags
-# CFLAGS = -ansi -Wall -pg -O3 `gtk-config --cflags` ${EXTRA} -DPRO
+# CFLAGS = -ansi -Wall -pg -O3 ${EXTRA} -DPRO
 # test coverage cflags
-# CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g `gtk-config --cflags` ${EXTRA} -DPRO
+# CFLAGS = -fprofile-arcs -ftest-coverage -Wall -ansi -g ${EXTRA} -DPRO
 
 
-SHELL=sh
+SHELL = sh
 OS = $(shell uname -s)
+SRCS = bubblemon.c
 OBJS = bubblemon.o
+BUBBLEMON = bubblemon
+
+LDFLAGS = -shared -Wl
+
+STRIP = strip
+
 CC = gcc
+INSTALLMAN = -m 644
+
+
 
 # special things for Linux
 ifeq ($(OS), Linux)
-    OBJS += sys_linux.o
-    LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
-    INSTALL = -m 755
+	SRCS += sys_linux.c
+	OBJS += sys_linux.o
+	INSTALL = -m 755
+	INSTALLMAN = -m 644
 endif
 
 # special things for FreeBSD
 ifeq ($(OS), FreeBSD)
+	SRCS += sys_freebsd.c
     OBJS += sys_freebsd.o
-    LIBS = `gtk-config --libs | sed "s/-lgtk//g"` -lkvm
+    LIBS = -lkvm
     INSTALL = -c -g kmem -m 2755 -o root
 endif
 
@@ -62,17 +81,21 @@
     ifeq ($(COMPILER), gcc)
 	CFLAGS=-O3 -Wall
     endif
-    CFLAGS +=`gtk-config --cflags` ${EXTRA}
+    CFLAGS += ${EXTRA}
+	SRCS += sys_sunos.c
     OBJS += sys_sunos.o
-    LIBS = `gtk-config --libs` -lkstat -lm
+    LIBS = -lkstat -lm
     INSTALL = -m 755
 endif
 
+all: $(BUBBLEMON)
 
-all: bubblemon
+bubblemon: clean_obj
+	$(CC) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEMON) \
+		$(LIBS) $(GTK2_LIBS) $(SRCS)
 
-bubblemon: $(OBJS)
-	$(CC) $(CFLAGS) -o bubblemon $(OBJS) $(LIBS)
+clean_obj:
+	rm -rf *.o
 
 clean:
 	rm -f bubblemon *.o *.bb* *.gcov gmon.* *.da *~



1.1                  x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/bubblemon/files/bubblemon-1.46-no_display.patch?rev=1.1&content-type=text/plain

Index: bubblemon-1.46-no_display.patch
===================================================================
http://bugs.gentoo.org/310399

--- bubblemon.c
+++ bubblemon.c
@@ -44,7 +44,7 @@
  */
 #define _GNU_SOURCE
 
-#define VERSION "1.41"
+#define VERSION "1.46"
 
 /* general includes */
 #include <stdio.h>
@@ -276,6 +276,8 @@
 
 int main(int argc, char **argv)
 {
+    /* This is needed to proper dockapp work on >=GTK+-2.18 */
+    setenv("GDK_NATIVE_WINDOWS", "1", 0);
     char execute[256];
     int proximity = 0;
     int ch;
@@ -607,10 +609,7 @@
 
     gdk_window_show(bm.win);
     XSetWMHints(GDK_WINDOW_XDISPLAY(bm.win), win, &wmhints);
-#ifdef KDE_DOCKAPP
-    /* makes the dockapp visible inside KDE wm */
     gdk_window_show(bm.iconwin);
-#endif
 
     /* We begin with zero bubbles */
     bm.n_bubbles = 0;



1.1                  x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-plugins/bubblemon/files/bubblemon-1.46-asneeded.patch?rev=1.1&content-type=text/plain

Index: bubblemon-1.46-asneeded.patch
===================================================================
--- Makefile
+++ Makefile
@@ -32,14 +32,12 @@
 OBJS = bubblemon.o
 BUBBLEMON = bubblemon
 
-LDFLAGS = -shared -Wl
-
 STRIP = strip
 
-CC = gcc
+CC ?= gcc
 INSTALLMAN = -m 644
 
-
+LIBS = -lX11
 
 # special things for Linux
 ifeq ($(OS), Linux)
@@ -91,8 +89,8 @@
 all: $(BUBBLEMON)
 
 bubblemon: clean_obj
-	$(CC) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEMON) \
-		$(LIBS) $(GTK2_LIBS) $(SRCS)
+	$(CC) $(LDFLAGS) $(GTK2_CFLAGS) $(CFLAGS) -o $(BUBBLEMON) \
+		$(SRCS) $(LIBS) $(GTK2_LIBS)
 
 clean_obj:
 	rm -rf *.o