cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with new GTK+2.

Browse Source
This commit is contained in:
ajacoutot 2010-09-30 07:23:47 +00:00
parent 21da929ec9
commit f26c46c3b3
23 changed files with 231 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
emulators/sdlmess/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2010/05/09 17:45:12 jakemsr Exp $
# $OpenBSD: Makefile,v 1.9 2010/09/30 07:26:05 ajacoutot Exp $
# Other archs have not been tested
ONLY_FOR_ARCHS = amd64 i386
@ -7,7 +7,7 @@ COMMENT = emulates game consoles and old home computers
V = 0.132
DISTNAME = sdlmess${V:S/.//}
PKGNAME = sdlmess-${V}p2
PKGNAME = sdlmess-${V}p3
CATEGORIES = emulators games
@ -26,7 +26,7 @@ WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1
WANTLIB += expat fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0
WANTLIB += gobject-2.0 gthread-2.0 iconv intl m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pixman-1 png pthread pthread-stubs xcb z
WANTLIB += xcb-render xcb-render-util
WANTLIB += xcb-render xcb-render-util gdk_pixbuf-2.0
MASTER_SITES = http://rbelmont.mameworld.info/
EXTRACT_SUFX = .zip
@ -36,7 +36,7 @@ MODGCC4_ARCHES = *
MODGCC4_LANGS = c
LIB_DEPENDS = SDL::devel/sdl gconf-2.>=5::devel/gconf2 \
gdk-x11-2.0.>=0.11,gdk_pixbuf-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2
gdk-x11-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2
RUN_DEPENDS = :sdlmame-tools-${V}:emulators/sdlmame,-tools
USE_GMAKE = Yes

16
emulators/sdlmess/patches/patch-src_osd_sdl_sdl_mak Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-src_osd_sdl_sdl_mak,v 1.3 2010/09/30 07:26:05 ajacoutot Exp $
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
src/osd/sdl/dview.c:138: warning: implicit declaration of function 'GTK_OBJECT_FLAGS'
src/osd/sdl/dview.c:138: error: lvalue required as left operand of assignment
--- src/osd/sdl/sdl.mak.orig Wed Sep 29 17:27:36 2010
+++ src/osd/sdl/sdl.mak Wed Sep 29 17:27:43 2010
@@ -272,7 +272,6 @@ ifndef NO_X11
OSDCOREOBJS += $(SDLOBJ)/debugwin.o $(SDLOBJ)/dview.o $(SDLOBJ)/debug-sup.o $(SDLOBJ)/debug-intf.o
CFLAGS += `pkg-config --cflags gtk+-2.0` `pkg-config --cflags gconf-2.0`
LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0`
-CFLAGS += -DGTK_DISABLE_DEPRECATED
else
OSDCOREOBJS += $(SDLOBJ)/debugwin.o
endif # NO_X11

8
graphics/gfract/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2009/08/10 06:31:44 kili Exp $
# $OpenBSD: Makefile,v 1.13 2010/09/30 07:26:04 ajacoutot Exp $
COMMENT= fractal program with GTK interface
DISTNAME= gfract-0.33
PKGNAME= ${DISTNAME}p5
REVISION= 6
DISTFILES= ${DISTNAME}.tar.gz \
gfract-palettes-0.1.tar.gz
CATEGORIES= graphics math
@ -23,9 +23,9 @@ WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig
WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
WANTLIB += pthread-stubs stdc++ xcb z
WANTLIB += pthread-stubs stdc++ xcb z gdk_pixbuf-2.0
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
LIB_DEPENDS= gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
MODULES= devel/gettext

11
graphics/gfract/patches/patch-Makefile
View File

@ -1,13 +1,16 @@
$OpenBSD: patch-Makefile,v 1.3 2007/10/24 22:43:42 jasper Exp $
--- Makefile.orig Tue Apr 18 09:31:44 2006
+++ Makefile Tue Oct 16 14:01:56 2007
$OpenBSD: patch-Makefile,v 1.4 2010/09/30 07:26:04 ajacoutot Exp $
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
--- Makefile.orig Tue Apr 18 17:31:44 2006
+++ Makefile Thu Sep 30 08:33:08 2010
@@ -2,8 +2,7 @@ PROG := gfract
CXX := g++
-DEFS := -Wall -ansi -pedantic -D_GNU_SOURCE -DGDK_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED
+DEFS := -Wall -ansi -pedantic -D_GNU_SOURCE -DGDK_DISABLE_DEPRECATED
+DEFS := -Wall -ansi -pedantic -D_GNU_SOURCE
DEFS := $(shell pkg-config --cflags gtk+-2.0 libpng) $(DEFS)

17
graphics/ufraw/patches/patch-configure Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-configure,v 1.4 2010/09/30 07:26:05 ajacoutot Exp $
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
graphics/ufraw to fix : ufraw_preview.c:4026: error: expected declaration specifiers or '...' before 'GtkNotebookPage'
--- configure.orig Thu Sep 30 07:32:11 2010
+++ configure Thu Sep 30 07:31:10 2010
@@ -5556,9 +5556,6 @@ $as_echo "#define G_DISABLE_DEPRECATED /**/" >>confdef
$as_echo "#define GDK_DISABLE_DEPRECATED /**/" >>confdefs.h
-$as_echo "#define GTK_DISABLE_DEPRECATED /**/" >>confdefs.h
-
-
$as_echo "#define GTK_DISABLE_SINGLE_INCLUDES /**/" >>confdefs.h

4
inputmethods/ibus/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2010/09/01 19:22:44 fgsch Exp $
# $OpenBSD: Makefile,v 1.6 2010/09/30 07:26:04 ajacoutot Exp $
SHARED_ONLY = Yes
@ -6,7 +6,7 @@ COMMENT = intelligent input bus framework
DISTNAME = ibus-1.3.7
REVISION = 3
REVISION = 4
SHARED_LIBS = ibus 0.0 # 2.0

6
inputmethods/ibus/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2010/08/23 07:57:52 fgsch Exp $
@comment $OpenBSD: PLIST,v 1.4 2010/09/30 07:26:05 ajacoutot Exp $
@bin bin/ibus-daemon
bin/ibus-setup
include/ibus-1.0/
@ -319,8 +319,8 @@ share/locale/zh_TW/LC_MESSAGES/ibus.mo
${SCHEMAS_INSTDIR}/
${SCHEMAS_INSTDIR}/ibus.schemas
@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
@exec %D/bin/gtk-query-immodules-2.0 > /var/db/gtk-2.0/gtk.immodules
@unexec-delete %D/bin/gtk-query-immodules-2.0 > /var/db/gtk-2.0/gtk.immodules
@exec %D/bin/gtk-query-immodules-2.0 > ${SYSCONFDIR}/gtk-2.0/gtk.immodules
@unexec-delete %D/bin/gtk-query-immodules-2.0 > ${SYSCONFDIR}/gtk-2.0/gtk.immodules
@exec %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@unexec-delete %D/bin/gtk-update-icon-cache -q -f -t %D/share/icons/hicolor 2> /dev/null || true
@exec %D/bin/update-desktop-database

4
inputmethods/scim/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.10 2010/08/18 10:31:21 fgsch Exp $
# $OpenBSD: Makefile,v 1.11 2010/09/30 07:26:05 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= smart common input method platform
DISTNAME= scim-1.4.9
REVISION= 5
REVISION= 6
SHARED_LIBS += scim-1.0 0.0 # .10.4
SHARED_LIBS += scim-x11utils-1.0 0.0 # .10.4

6
inputmethods/scim/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2010/08/18 06:03:45 fgsch Exp $
@comment $OpenBSD: PLIST,v 1.5 2010/09/30 07:26:05 ajacoutot Exp $
@bin bin/scim
@bin bin/scim-config-agent
bin/scim-setup
@ -155,7 +155,7 @@ share/scim/icons/sctc.png
share/scim/icons/setup.png
share/scim/icons/trademark.png
share/scim/icons/up.png
@exec %D/bin/gtk-query-immodules-2.0 > /var/db/gtk-2.0/gtk.immodules
@unexec-delete %D/bin/gtk-query-immodules-2.0 > /var/db/gtk-2.0/gtk.immodules
@exec %D/bin/gtk-query-immodules-2.0 > ${SYSCONFDIR}/gtk-2.0/gtk.immodules
@unexec-delete %D/bin/gtk-query-immodules-2.0 > ${SYSCONFDIR}/gtk-2.0/gtk.immodules
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database

20
multimedia/libquicktime/patches/patch-configure
View File

@ -1,6 +1,11 @@
$OpenBSD: patch-configure,v 1.10 2010/05/26 22:31:23 jakemsr Exp $
--- configure.orig Tue Feb 23 12:43:36 2010
+++ configure Tue May 18 17:55:59 2010
$OpenBSD: patch-configure,v 1.11 2010/09/30 07:26:05 ajacoutot Exp $
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
lqt_gtk.c:944: warning: implicit declaration of function 'GTK_OBJECT_FLAGS'
lqt_gtk.c:944: error: lvalue required as left operand of assignment
--- configure.orig Tue Feb 23 21:43:36 2010
+++ configure Wed Sep 29 19:50:57 2010
@@ -14553,7 +14553,7 @@ fi
VORBIS_LIBS="-L$prefix/lib"
fi
@ -26,3 +31,12 @@ $OpenBSD: patch-configure,v 1.10 2010/05/26 22:31:23 jakemsr Exp $
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lame" >&5
@@ -15837,7 +15837,7 @@ fi
-GTK_CFLAGS="$GTK_CFLAGS -DGTK_DISABLE_DEPRECATED"
+GTK_CFLAGS="$GTK_CFLAGS"
have_libdv="false"

27
www/kazehakase/patches/patch-configure
View File

@ -1,7 +1,13 @@
$OpenBSD: patch-configure,v 1.6 2010/06/19 10:34:41 landry Exp $
$OpenBSD: patch-configure,v 1.7 2010/09/30 07:26:05 ajacoutot Exp $
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
kz-tabtree.c:88: error: expected declaration specifiers or '...' before 'GtkNotebookPage'
kz-tabtree.c:699: error: expected declaration specifiers or '...' before 'GtkNotebookPage'
XXX we know our xl has webprogresslistener2 but nspr headers not in -I during configure
--- configure.orig Tue Sep 29 05:44:00 2009
+++ configure Fri Jun 18 22:02:55 2010
+++ configure Wed Sep 29 20:09:55 2010
@@ -16296,13 +16296,13 @@ fi
if test x"$enable_gtkmozembed" = "xyes"; then
@ -33,11 +39,10 @@ XXX we know our xl has webprogresslistener2 but nspr headers not in -I during co
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
@@ -20795,77 +20790,6 @@ fi
@@ -20796,77 +20791,6 @@ fi
anthy_exists=no
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANTHY" >&5
-$as_echo_n "checking for ANTHY... " >&6; }
@ -108,6 +113,16 @@ XXX we know our xl has webprogresslistener2 but nspr headers not in -I during co
-$as_echo "yes" >&6; }
- anthy_exists=yes
-fi
-
# Extract the first word of "mecab-config", so it can be a program name with args.
set dummy mecab-config; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -21422,7 +21346,7 @@ fi
GENHTML_OPTIONS="--title 'Kazehakase Code Coverage'"
KAZEHAKASE_CFLAGS="$GTK_CFLAGS $LIBGNUTLS_CFLAGS $GIO_CFLAGS $DBUS_GLIB_CFLAGS"
-KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
+KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DGDK_DISABLE_DEPRECATED"
KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DG_DISABLE_DEPRECATED"
KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DSYSDATADIR=\\\"\"\$(datadir)\"\\\""
KAZEHAKASE_CFLAGS="$KAZEHAKASE_CFLAGS -DLOCALEDIR=\\\"\"\$(localedir)\"\\\""

10
www/netsurf/browser/Makefile
View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.2 2010/07/06 16:27:46 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.3 2010/09/30 07:26:05 ajacoutot Exp $
COMMENT = lightweight web browser
NETSURF_PROJECT = netsurf
NETSURF_VERSION = 2.5
PKGNAME = ${DISTNAME:S/-src//}p0
PKGNAME = ${DISTNAME:S/-src//}
REVISION = 1
CATEGORIES= www
@ -18,7 +20,7 @@ LIB_DEPENDS = hubbub::www/netsurf/hubbub \
nsgif::www/netsurf/libnsgif \
nsbmp::www/netsurf/libnsbmp \
mng::graphics/libmng \
gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \
glade-2.0::devel/libglade2 \
rsvg-2::x11/gnome/librsvg \
curl::net/curl
@ -29,7 +31,7 @@ WANTLIB += pangoft2-1.0 parserutils png wapcaplet xml2
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender c crypto expat fontconfig
WANTLIB += freetype m pixman-1 pthread pthread-stubs ssl xcb
WANTLIB += xcb-render xcb-render-util z
WANTLIB += xcb-render xcb-render-util z gdk_pixbuf-2.0
WRKDIST = ${WRKDIR}/netsurf

20
www/netsurf/browser/patches/patch-Makefile
View File

@ -1,6 +1,10 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
$OpenBSD: patch-Makefile,v 1.2 2010/09/30 07:26:05 ajacoutot Exp $
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
gtk/gtk_tabs.c:41: error: expected declaration specifiers or '...' before 'GtkNotebookPage'
--- Makefile.orig Mon Apr 19 22:56:28 2010
+++ Makefile Fri Jun 25 19:04:35 2010
+++ Makefile Thu Sep 30 07:49:36 2010
@@ -102,8 +102,8 @@ ifneq ($(TARGET),riscos)
endif
endif
@ -21,7 +25,15 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
LDFLAGS += $(shell $(PKG_CONFIG) --libs libcss)
# define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here
@@ -452,7 +452,7 @@ ifeq ($(TARGET),gtk)
@@ -444,7 +444,6 @@ ifeq ($(TARGET),gtk)
$(eval $(call pkg_config_find_and_add,PNG,libpng,PNG ))
GTKCFLAGS := -std=c99 -Dgtk -Dnsgtk \
- -DGTK_DISABLE_DEPRECATED \
-D_BSD_SOURCE \
-D_XOPEN_SOURCE=600 \
-D_POSIX_C_SOURCE=200112L \
@@ -452,7 +451,7 @@ ifeq ($(TARGET),gtk)
-DGTK_RESPATH=\"$(NETSURF_GTK_RESOURCES)\" \
$(WARNFLAGS) -I. -g \
$(shell $(PKG_CONFIG) --cflags libglade-2.0 gtk+-2.0) \
@ -30,7 +42,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2010/06/29 20:11:13 landry Exp $
$(shell xml2-config --cflags)
GTKLDFLAGS := $(shell $(PKG_CONFIG) --cflags --libs libglade-2.0 gtk+-2.0 gthread-2.0 gmodule-2.0 lcms)
@@ -799,26 +799,26 @@ clean: $(CLEANS)
@@ -799,26 +798,26 @@ clean: $(CLEANS)
install-gtk: nsgtk
mkdir -p $(DESTDIR)$(NETSURF_GTK_RESOURCES)throbber
mkdir -p $(DESTDIR)$(NETSURF_GTK_BIN)

22
x11/compiz/core/patches/patch-gtk_window-decorator_gtk-window-decorator_c
View File

@ -1,10 +1,22 @@
$OpenBSD: patch-gtk_window-decorator_gtk-window-decorator_c,v 1.1 2010/04/27 21:01:51 jasper Exp $
$OpenBSD: patch-gtk_window-decorator_gtk-window-decorator_c,v 1.2 2010/09/30 07:23:47 ajacoutot Exp $
Fix build with gtk+ 2.20.
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
gtk-window-decorator.c:5626: error: 'gdk_display' undeclared (first use in this function)
--- gtk/window-decorator/gtk-window-decorator.c.orig Tue Apr 27 22:54:04 2010
+++ gtk/window-decorator/gtk-window-decorator.c Tue Apr 27 22:54:52 2010
@@ -4233,7 +4233,7 @@ show_tooltip (const char *text)
--- gtk/window-decorator/gtk-window-decorator.c.orig Sun Mar 1 13:07:14 2009
+++ gtk/window-decorator/gtk-window-decorator.c Wed Sep 29 21:11:16 2010
@@ -31,10 +31,6 @@
#include <X11/extensions/Xrender.h>
#include <X11/Xregion.h>
-#ifndef GDK_DISABLE_DEPRECATED
-#define GDK_DISABLE_DEPRECATED
-#endif
-
#ifndef GTK_DISABLE_DEPRECATED
#define GTK_DISABLE_DEPRECATED
#endif
@@ -4233,7 +4229,7 @@ show_tooltip (const char *text)
static void
hide_tooltip (void)
{

15
x11/devilspie/patches/patch-src_Makefile_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-src_Makefile_in,v 1.1 2010/09/30 07:23:47 ajacoutot Exp $
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
src/xutils.c:43: error: 'gdk_display' undeclared (first use in this function)
--- src/Makefile.in.orig Thu Sep 30 08:40:11 2010
+++ src/Makefile.in Thu Sep 30 08:40:00 2010
@@ -252,7 +252,6 @@ AM_CPPFLAGS = \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DDATADIR=\""$(datadir)"\" \
-DG_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DWNCK_I_KNOW_THIS_IS_UNSTABLE

18
x11/gbdfed/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-Makefile_in,v 1.5 2010/09/30 07:23:47 ajacoutot Exp $
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
gectrl.c:639: warning: implicit declaration of function 'gdk_gc_set_clip_rectangle'
fontgrid.c:601: warning: implicit declaration of function 'GTK_OBJECT_FLAGS'
--- Makefile.in.orig Fri Apr 16 16:38:59 2010
+++ Makefile.in Thu Sep 30 08:45:32 2010
@@ -28,8 +28,7 @@ CC = @CC@
CFLAGS = @XX_CFLAGS@ @CFLAGS@
DEFINES = @DEFINES@ -DG_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGTK_DISABLE_DEPRECATED
+ -DGDK_PIXBUF_DISABLE_DEPRECATED
SRCS = bdf.c \
bdfcons.c \

29
x11/gentoo/patches/patch-src_odmultibutton_c
View File

@ -1,10 +1,21 @@
$OpenBSD: patch-src_odmultibutton_c,v 1.1 2010/04/27 20:20:45 jasper Exp $
$OpenBSD: patch-src_odmultibutton_c,v 1.2 2010/09/30 07:23:47 ajacoutot Exp $
Fix build with gtk+ 2.20.
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
odmultibutton.c:324: error: implicit declaration of function 'GTK_OBJECT_FLAGS'
--- src/odmultibutton.c.orig Tue Apr 27 22:09:35 2010
+++ src/odmultibutton.c Tue Apr 27 22:19:49 2010
@@ -73,8 +73,8 @@ static void od_multibutton_set_page(GtkWidget *widget,
--- src/odmultibutton.c.orig Tue Jun 23 22:57:22 2009
+++ src/odmultibutton.c Thu Sep 30 07:33:44 2010
@@ -5,9 +5,6 @@
#include <stdio.h>
#include <stdlib.h>
-/* ODMultiButton is 2.x pure, like freshly fallen snow. */
-#define GTK_DISABLE_DEPRECATED
-
#include <gtk/gtk.h>
#include "odmultibutton.h"
@@ -73,8 +70,8 @@ static void od_multibutton_set_page(GtkWidget *widget,
}
if(p != NULL)
{
@ -15,7 +26,7 @@ Fix build with gtk+ 2.20.
gtk_widget_show(p);
if(gtk_widget_get_parent(p) != NULL)
gtk_widget_reparent(p, widget);
@@ -86,7 +86,7 @@ static void od_multibutton_set_page(GtkWidget *widget,
@@ -86,7 +83,7 @@ static void od_multibutton_set_page(GtkWidget *widget,
}
mb->last_index = index;
}
@ -24,7 +35,7 @@ Fix build with gtk+ 2.20.
gtk_widget_queue_draw(widget);
}
@@ -144,9 +144,9 @@ static void od_multibutton_paint_dog_ear(GtkWidget *wi
@@ -144,9 +141,9 @@ static void od_multibutton_paint_dog_ear(GtkWidget *wi
{
GtkStateType state;
@ -36,7 +47,7 @@ Fix build with gtk+ 2.20.
{
GtkStyle *style = gtk_widget_get_style(widget);
const guint EARSIZE = 5;
@@ -209,7 +209,7 @@ static void od_multibutton_paint_foreground(GtkWidget
@@ -209,7 +206,7 @@ static void od_multibutton_paint_foreground(GtkWidget
g_return_if_fail(area != NULL);
g_return_if_fail(OD_IS_MULTIBUTTON(widget));
@ -45,7 +56,7 @@ Fix build with gtk+ 2.20.
{
ODMultiButton *mb = OD_MULTIBUTTON(widget);
@@ -449,7 +449,7 @@ void od_multibutton_set_text(ODMultiButton *mb, guint
@@ -449,7 +446,7 @@ void od_multibutton_set_text(ODMultiButton *mb, guint
od_multibutton_reset_label(mb, index, GTK_LABEL(w), text, bg, fg);
if(GTK_WIDGET(mb)->parent)
gtk_widget_queue_resize(GTK_WIDGET(mb));

4
x11/gnome/librsvg/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.52 2010/09/28 07:41:07 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.53 2010/09/30 07:23:47 ajacoutot Exp $
COMMENT= SAX-based render library for SVG files
GNOME_PROJECT= librsvg
GNOME_VERSION= 2.32.0
REVISION= 0
REVISION= 1
SHARED_LIBS += rsvg-2 28.0 # .34.0

12
x11/gnome/librsvg/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.21 2010/09/27 05:54:32 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.22 2010/09/30 07:23:47 ajacoutot Exp $
bin/rsvg
@bin bin/rsvg-convert
@bin bin/rsvg-view
@ -8,12 +8,12 @@ include/librsvg-2.0/librsvg/librsvg-enum-types.h
include/librsvg-2.0/librsvg/librsvg-features.h
include/librsvg-2.0/librsvg/rsvg-cairo.h
include/librsvg-2.0/librsvg/rsvg.h
@comment lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.a
@comment lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.la
lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-svg.so
@comment lib/gtk-2.0/2.10.0/engines/libsvg.a
@comment lib/gtk-2.0/2.10.0/engines/libsvg.la
lib/gtk-2.0/2.10.0/engines/libsvg.so
@comment lib/gtk-2.0/2.10.0/loaders/libpixbufloader-svg.a
@comment lib/gtk-2.0/2.10.0/loaders/libpixbufloader-svg.la
lib/gtk-2.0/2.10.0/loaders/libpixbufloader-svg.so
@comment lib/gtk-3.0/
@comment lib/gtk-3.0/engines/
lib/librsvg-2.a
@ -58,6 +58,6 @@ share/themes/bubble/gtk-2.0/gtkrc
share/themes/bubble/gtk-2.0/orange.svg
share/themes/bubble/gtk-2.0/purple.svg
share/themes/bubble/gtk-2.0/red.svg
@exec %D/bin/gdk-pixbuf-query-loaders > /var/db/gtk-2.0/gdk-pixbuf.loaders
@unexec-delete %D/bin/gdk-pixbuf-query-loaders > /var/db/gtk-2.0/gdk-pixbuf.loaders
@comment share/themes/bubble/gtk-3.0/
@exec %D/bin/gdk-pixbuf-query-loaders --update-cache
@unexec-delete %D/bin/gdk-pixbuf-query-loaders --update-cache

15
x11/gtk-chtheme/patches/patch-Makefile Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-Makefile,v 1.1 2010/09/30 07:23:47 ajacoutot Exp $
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
--- Makefile.orig Thu Sep 30 08:50:42 2010
+++ Makefile Thu Sep 30 08:50:49 2010
@@ -4,7 +4,7 @@ CFLAGS := $(if $(RPM_OPT_FLAGS), $(RPM_OPT_FLAGS), $(C
LDFLAGS = $(shell pkg-config --libs gtk+-2.0)
CFLAGS += -Wall
-CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -DGTK_DISABLE_BROKEN -DGTK_DISABLE_DEPRECATED
+CFLAGS += $(shell pkg-config --cflags gtk+-2.0) -DGTK_DISABLE_BROKEN
CFLAGS += -DPROJNAME='"$(PROJNAME)"' -DVERSION='"$(VERSION)"'
CPPFLAGS =
CXXFLAGS =

15
x11/gtkdatabox/patches/patch-examples_Makefile_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-examples_Makefile_in,v 1.1 2010/09/30 07:23:47 ajacoutot Exp $
XXX make it compile with gtk+2 2.22 (*_DISABLE_DEPRECATED)
basics.c:116: error: lvalue required as left operand of assignment
--- examples/Makefile.in.orig Thu Sep 30 07:43:59 2010
+++ examples/Makefile.in Thu Sep 30 07:44:05 2010
@@ -285,7 +285,6 @@ AM_CFLAGS = \
-DG_DISABLE_DEPRECATED\
-DGDK_DISABLE_DEPRECATED\
-DGDK_PIXBUF_DISABLE_DEPRECATED\
- -DGTK_DISABLE_DEPRECATED\
@LIBGLADE_CFLAGS@ \
`pkg-config gtk+-2.0 --cflags`

5
x11/trayer/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.8 2010/07/30 08:02:59 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.9 2010/09/30 07:23:47 ajacoutot Exp $
COMMENT= lightweight GTK2-based systray
@ -29,8 +29,7 @@ MODULES= devel/gettext
LIB_DEPENDS= ::x11/gtk+2
MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS} -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
MAKE_FLAGS= CC="${CC}" CFLAGS="${CFLAGS} -DG_DISABLE_DEPRECATED"
NO_REGRESS= Yes

6
x11/wmmenu/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.15 2010/07/30 08:03:00 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.16 2010/09/30 07:23:47 ajacoutot Exp $
COMMENT= wm-dockapp; A popup menu of icons that launch programs
DISTNAME= wmmenu-1.2
REVISION= 2
REVISION= 3
CATEGORIES= x11 x11/windowmaker
HOMEPAGE= http://www.fcoutant.freesurf.fr/wmmenu.html
@ -29,7 +29,7 @@ FLAVOR?=
.if ${FLAVOR:L:Mgdk_pixbuf}
MAKE_FLAGS= GDKPIXBUF2=1
LIB_DEPENDS+= ::x11/gtk+2
LIB_DEPENDS+= ::graphics/gdk-pixbuf2
CFLAGS+= -pthread
MAKE_ENV+= LDFLAGS="-pthread"
WANTLIB += pthread gdk_pixbuf_xlib-2.0