[gentoo-commits] gentoo-x86 commit in net-misc/packETH/files: packETH-1.6.3-gentoo.patch packETH-1.6.3-pixmaps.patch

[Jeroen Roovers (jer)]

jer         09/11/01 22:41:59

  Added:                packETH-1.6.3-gentoo.patch
                        packETH-1.6.3-pixmaps.patch
  Log:
  Version bump thanks to DrChandra (bug #260381). Respect CC, CFLAGS, LDFLAGS, and point to proper pixmaps directory.
  (Portage version: 2.2_rc48/cvs/Linux i686)

Revision  Changes    Path
1.1                  net-misc/packETH/files/packETH-1.6.3-gentoo.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/packETH/files/packETH-1.6.3-gentoo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/packETH/files/packETH-1.6.3-gentoo.patch?rev=1.1&content-type=text/plain

Index: packETH-1.6.3-gentoo.patch
===================================================================
--- packETH-1.6.3/Makefile.orig	2009-01-20 16:07:51.000000000 +0100
+++ packETH-1.6.3/Makefile	2009-11-01 23:22:52.000000000 +0100
@@ -22,17 +22,15 @@
 prefix = /usr
 includedir = /usr/src/include
 
+packages = gthread-2.0 gtk+-x11-2.0
+
 INSTALL = /usr/bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PREFIX = /usr
 
-CC = gcc
-CPPFLAGS =  -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include 
-LDFLAGS = 
-CFLAGS = -g -O2 -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations 
-#LIBS = -L/usr/lib -L/usr/X11R6/lib -lgtk -lgdk -lglib -lXi -lXext -lX11 -lm -lpthread -lgthread
-#LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lpthread -lgthread-2.0
-LIBS = -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lgobject-2.0 -lglib-2.0 -lpthread -lgthread-2.0
+CPPFLAGS = $(shell pkg-config --cflags $(packages))
+CFLAGS += -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations 
+LIBS = $(shell pkg-config --libs $(packages))
 
 SOURCES = \
 	main.c \



1.1                  net-misc/packETH/files/packETH-1.6.3-pixmaps.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/packETH/files/packETH-1.6.3-pixmaps.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/packETH/files/packETH-1.6.3-pixmaps.patch?rev=1.1&content-type=text/plain

Index: packETH-1.6.3-pixmaps.patch
===================================================================
--- packETH-1.6.3/interface.c.orig	2009-10-23 17:24:31.000000000 +0200
+++ packETH-1.6.3/interface.c	2009-11-01 23:27:22.000000000 +0100
@@ -914,6 +914,8 @@
   GtkWidget *label251;
   GtkWidget *statusbar1;
 
+  add_pixmap_directory ("/usr/share/pixmaps/packETH");
+
   window1 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_window_set_title (GTK_WINDOW (window1), _("PackETH - ethernet packet generator"));
   gtk_window_set_position (GTK_WINDOW (window1), GTK_WIN_POS_CENTER);