tags 515274 + patch
thank you
Hi,
Here is a patch I created that at least builds and runs with Gtk2. I'm
not very familiar with the package so I could not do much testing
unfortunately.
Hope it helps.
Thanks,
Barry deFreese
Debian QA
diff -u gbuffy-0.2.6/debian/control gbuffy-0.2.6/debian/control
--- gbuffy-0.2.6/debian/control
+++ gbuffy-0.2.6/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Adeodato Simó <d...@net.com.org.es>
Standards-Version: 3.7.3
-Build-Depends: debhelper, quilt, libwings-dev, libgtk1.2-dev,
libcompfaceg1-dev, libssl-dev
+Build-Depends: debhelper, quilt, autoconf, automake, libwings-dev,
libgtk2.0-dev, libcompfaceg1-dev, libssl-dev
Vcs-Bzr: http://people.debian.org/~adeodato/code/packages/gbuffy
Package: gbuffy
diff -u gbuffy-0.2.6/debian/rules gbuffy-0.2.6/debian/rules
--- gbuffy-0.2.6/debian/rules
+++ gbuffy-0.2.6/debian/rules
@@ -8,6 +8,9 @@
build-stamp: patch
dh_testdir
+
+ autoreconf -f -i
+
./configure --prefix=/usr
$(MAKE) WITH_LIBWINGS=1
touch build-stamp
diff -u gbuffy-0.2.6/debian/changelog gbuffy-0.2.6/debian/changelog
--- gbuffy-0.2.6/debian/changelog
+++ gbuffy-0.2.6/debian/changelog
@@ -1,3 +1,10 @@
+gbuffy (0.2.6-13.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build with Gtk2.
+
+ -- Barry deFreese <bdefre...@debian.org> Mon, 23 Mar 2009 23:11:31 -0400
+
gbuffy (0.2.6-13) unstable; urgency=low
* Add patch from Tim Connors to augment the size of the xface buffer
diff -u gbuffy-0.2.6/debian/patches/series gbuffy-0.2.6/debian/patches/series
--- gbuffy-0.2.6/debian/patches/series
+++ gbuffy-0.2.6/debian/patches/series
@@ -6,0 +7 @@
+40_gtk2.diff
only in patch2:
unchanged:
--- gbuffy-0.2.6.orig/debian/patches/40_gtk2.diff
+++ gbuffy-0.2.6/debian/patches/40_gtk2.diff
@@ -0,0 +1,180 @@
+Index: gbuffy-0.2.6/configure.in
+===================================================================
+--- gbuffy-0.2.6.orig/configure.in 2009-03-23 23:12:54.000000000 -0400
++++ gbuffy-0.2.6/configure.in 2009-03-23 23:17:10.000000000 -0400
+@@ -18,7 +18,7 @@
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+ AC_SUBST(VERSION)
+
+-AM_PATH_GTK(1.1.11)
++AM_PATH_GTK_2_0(2.0.0)
+
+ gbuffy_led=no
+ AC_ARG_ENABLE(led, [ --enable-led Enable LINUX specific LED
support],
+@@ -57,16 +57,11 @@
+ ])
+
+ if test $gnome_applet = yes; then
+- AC_DEFINE(GNOME_APPLET)
+ AC_MSG_RESULT(Building as a GNOME Applet)
+- GNOME_INIT(applets)
+- GAPPLET_INCLUDE="`$GNOME_CONFIG --cflags applets`"
+- GAPPLET_LIBS="`$GNOME_CONFIG --libs applets`"
++ PKG_CHECK_MODULES(APPLET_GNOME, libpanelapplet-2.0, use_applet_gnome="yes",
use_applet_gnome="no")
+ else
+ AC_MSG_RESULT(Building as a standalone program)
+ fi
+-AC_SUBST(GAPPLET_INCLUDE)
+-AC_SUBST(GAPPLET_LIBS)
+
+ dnl gbuffy_nntp_server=no
+ dnl AC_ARG_ENABLE(nntp, [ --enable-nntp[=server] Enable NNTP 'Mailbox'
support],
+Index: gbuffy-0.2.6/Makefile.in
+===================================================================
+--- gbuffy-0.2.6.orig/Makefile.in 2009-03-23 23:17:31.000000000 -0400
++++ gbuffy-0.2.6/Makefile.in 2009-03-23 23:19:35.000000000 -0400
+@@ -16,14 +16,14 @@
+
+ insta...@install@
+ c...@cc@
+-XCPPFLAGS=-I. `...@gtk_config@ --cflags` @GAPPLET_INCLUDE@ @CPPFLAGS@
++XCPPFLAGS=-I. @GTK_CFLAGS@ @APPLET_GNOME_CFLAGS@ @CPPFLAGS@
+ cfla...@cflags@ $(XCPPFLAGS)
+ LDFLAGS=-L/usr/local/lib @LDFLAGS@
+ ifdef WITH_LIBWINGS
+-lib...@gtk_config@ --libs` @GAPPLET_LIBS@ -lWINGs @LIBS@
++li...@gtk_libs@ @APPLET_GNOME_LIBS@ -lWINGs @LIBS@
+ CFLAGS+=-DWITH_LIBWINGS
+ else
+-lib...@gtk_config@ --libs` @GAPPLET_LIBS@ -lPropList @LIBS@
++li...@gtk_libs@ @APPLET_GNOME_LIBS@ -lPropList @LIBS@
+ endif
+
+ OBJS = config.o count.o from.o gbconfig.o gbuffy.o lib.o rfc2047.o system.o \
+Index: gbuffy-0.2.6/gbuffy.c
+===================================================================
+--- gbuffy-0.2.6.orig/gbuffy.c 2009-03-23 23:20:57.000000000 -0400
++++ gbuffy-0.2.6/gbuffy.c 2009-03-23 23:21:19.000000000 -0400
+@@ -149,28 +149,37 @@
+ gint width,
+ gint height)
+ {
+- GdkWindowPrivate *drawable_private;
+- GdkWindowPrivate *src_private;
+- GdkGCPrivate *gc_private;
++ GdkWindow *drawable_private;
++ GdkWindow *src_private;
++ GdkGC *gc_private;
+ g_return_if_fail (drawable != NULL);
+ g_return_if_fail (src != NULL);
+ g_return_if_fail (gc != NULL);
+
+- drawable_private = (GdkWindowPrivate*) drawable;
+- src_private = (GdkWindowPrivate*) src;
+- if (drawable_private->destroyed || src_private->destroyed)
+- return;
+- gc_private = (GdkGCPrivate*) gc;
++ drawable_private = (GdkWindow *) drawable;
++ src_private = (GdkWindow *) src;
++ gc_private = (GdkGC *) gc;
+
+ if (width == -1)
+- width = src_private->width;
++/* width = src_private->width; */
++ gdk_drawable_get_size (src_private, &width, &height);
+ if (height == -1)
+- height = src_private->height;
++/* height = src_private->height; */
++ gdk_drawable_get_size (src_private, &width, &height);
+
+- XCopyPlane (drawable_private->xdisplay,
+- src_private->xwindow,
+- drawable_private->xwindow,
+- gc_private->xgc,
++/* BDD - No idea if this is correct. */
++/* XCopyPlane (drawable_private->xdisplay, */
++/* src_private->xwindow, */
++/* drawable_private->xwindow, */
++/* gc_private->xgc, */
++/* xsrc, ysrc, */
++/* width, height, */
++/* xdest, ydest, 1); */
++/*} */
++ XCopyPlane (gdk_x11_display_get_xdisplay(drawable_private),
++ gdk_x11_get_default_root_xwindow(),
++ gdk_x11_get_default_root_xwindow,
++ gdk_x11_gc_get_xgc(gc_private),
+ xsrc, ysrc,
+ width, height,
+ xdest, ydest, 1);
+@@ -244,7 +253,7 @@
+ else
+ {
+ any_display = TRUE;
+- gdk_draw_string (box->pixmap, da->style->font,
++ gdk_draw_string (box->pixmap, gtk_style_get_font(da->style),
+ da->style->fg_gc[GTK_WIDGET_STATE (da)],
+ x, y + (face_display * 3),
+ m->from);
+@@ -257,7 +266,7 @@
+ else
+ {
+ any_display = TRUE;
+- gdk_draw_string (box->pixmap, da->style->font,
++ gdk_draw_string (box->pixmap, gtk_style_get_font(da->style),
+ da->style->fg_gc[GTK_WIDGET_STATE (da)],
+ x, y + (face_display * 3),
+ m->subject);
+@@ -367,14 +376,14 @@
+ char buf[STRING];
+
+ snprintf (buf, sizeof (buf), "%s: %d", box->title, box->new_messages);
+- gtk_label_set (GTK_LABEL (GTK_BUTTON (box->button)->child), buf);
++ gtk_label_set (GTK_LABEL (GTK_BIN (box->button)->child), buf);
+ if (box->new_messages)
+ gtk_widget_set_state (box->button, GTK_STATE_SELECTED);
+ }
+ if (box->new_messages == 0)
+ return;
+
+- box->w = gtk_window_new (GTK_WINDOW_DIALOG);
++ box->w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ snprintf (buf, sizeof (buf), "%s: %d / %d", box->title,
box->new_messages,
+ box->num_messages);
+ gtk_window_set_title (GTK_WINDOW (box->w), buf);
+@@ -395,7 +404,7 @@
+ MESSAGE_INFO *m = (MESSAGE_INFO *)(headers->data);
+ if (m->from)
+ {
+- x = gdk_string_measure (box->w->style->font, m->from);
++ x = gdk_string_measure (gtk_style_get_font(box->w->style), m->from);
+ if (x > width)
+ width = x;
+ num++;
+@@ -406,7 +415,7 @@
+ }
+ if (m->subject)
+ {
+- x = gdk_string_measure (box->w->style->font, m->subject);
++ x = gdk_string_measure (gtk_style_get_font(box->w->style),
m->subject);
+ if (x > width)
+ width = x;
+ num++;
+@@ -417,7 +426,7 @@
+ num++;
+ }
+ /*
+- x = gdk_string_height (box->w->style->font, (char *)headers->data);
++ x = gdk_string_height (gtk_style_get_font(box->w->style), (char
*)headers->data);
+ if (x > height)
+ height = x;
+ */
+@@ -558,7 +567,7 @@
+ char buf[STRING];
+
+ snprintf (buf, sizeof (buf), "%s: %d", mbox->title, mbox->new_messages);
+- gtk_label_set (GTK_LABEL (GTK_BUTTON (mbox->button)->child), buf);
++ gtk_label_set (GTK_LABEL (GTK_BIN (mbox->button)->child), buf);
+ if (mbox->new_messages)
+ gtk_widget_set_state (mbox->button, GTK_STATE_SELECTED);
+ else
