From c59be8204d667d7e2626a0f78492dbb632b8dc27 Mon Sep 17 00:00:00 2001 From: espie Date: Thu, 13 Nov 2003 18:48:38 +0000 Subject: [PATCH] update ogle_gui to 0.9.2, to synch with ogle. Minor improvement: ogle_gui now uses gnome2 base libraries. This unconfuses our linker, that now has one single libxml to take care of. (temporary gtk1 flavor, which will probably vanish soon). okay'ed MAINTAINER. --- x11/ogle_gui/Makefile | 16 +++++++++++++--- x11/ogle_gui/distinfo | 6 +++--- x11/ogle_gui/patches/patch-configure | 12 ++++++------ x11/ogle_gui/patches/patch-src_my_glade_c | 14 +++++++------- x11/ogle_gui/pkg/PLIST | 3 ++- 5 files changed, 31 insertions(+), 20 deletions(-) diff --git a/x11/ogle_gui/Makefile b/x11/ogle_gui/Makefile index 413204c7d08..86c0faf993e 100644 --- a/x11/ogle_gui/Makefile +++ b/x11/ogle_gui/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.6 2003/03/28 18:17:15 espie Exp $ +# $OpenBSD: Makefile,v 1.7 2003/11/13 18:48:38 espie Exp $ CATEGORIES= x11 COMMENT= "GUI for ogle" -DISTNAME= ogle_gui-0.9.1 +DISTNAME= ogle_gui-0.9.2 HOMEPAGE= http://www.dtek.chalmers.se/groups/dvd/ # Authors can be reached at dvd@dtek.chalmers.se MASTER_SITES= ${HOMEPAGE}dist/ @@ -20,8 +20,18 @@ PERMIT_PACKAGE_FTP=Yes LIB_DEPENDS= dvdcontrol.9,msgevents.6::x11/ogle \ xml2::textproc/libxml \ - glade.5.0::devel/libglade \ + +FLAVORS=gtk1 +FLAVOR?= + +.if ${FLAVOR:L} == "gtk1" +LIB_DEPENDS+= glade.5.0::devel/libglade \ gtk.1.2::x11/gtk+ +.else +LIB_DEPENDS+= glade-2.0.0.0::devel/libglade2 \ + gtk-x11-2.0.0.0::x11/gtk+2 +CONFIGURE_ARGS+=--enable-gtk2 +.endif MODULES= gettext diff --git a/x11/ogle_gui/distinfo b/x11/ogle_gui/distinfo index cb0897f855b..93cce0adf31 100644 --- a/x11/ogle_gui/distinfo +++ b/x11/ogle_gui/distinfo @@ -1,3 +1,3 @@ -MD5 (ogle_gui-0.9.1.tar.gz) = 2010a629b3a16d8228529b092ebdde7e -RMD160 (ogle_gui-0.9.1.tar.gz) = 7d5067b3ce2b3b732cd3667f8e0e5ff74dec54e5 -SHA1 (ogle_gui-0.9.1.tar.gz) = ea4e17ee5f659f52c71345b511d5ed7f16b0910c +MD5 (ogle_gui-0.9.2.tar.gz) = e685aa3046f9da13532ede9300f2f794 +RMD160 (ogle_gui-0.9.2.tar.gz) = a08906940019c0ced828a15b6c220b594a006a3f +SHA1 (ogle_gui-0.9.2.tar.gz) = 0d73ec30852b9cd2a9714b5088f6ab6deecf097d diff --git a/x11/ogle_gui/patches/patch-configure b/x11/ogle_gui/patches/patch-configure index 6104c5b8ff1..ff82b082bb2 100644 --- a/x11/ogle_gui/patches/patch-configure +++ b/x11/ogle_gui/patches/patch-configure @@ -1,13 +1,13 @@ -$OpenBSD: patch-configure,v 1.3 2003/02/24 22:57:36 espie Exp $ +$OpenBSD: patch-configure,v 1.4 2003/11/13 18:48:38 espie Exp $ ---- configure.orig Sun Feb 23 12:50:07 2003 -+++ configure Mon Feb 24 23:45:46 2003 -@@ -11244,7 +11244,7 @@ _ACEOF - +--- configure.orig 2003-11-05 23:02:32.000000000 +0100 ++++ configure 2003-11-06 07:42:54.000000000 +0100 +@@ -11554,7 +11554,7 @@ _ACEOF + *) cat >>confdefs.h <<_ACEOF -#define LIBGLADE_LIB "libglade.so.0" +#define LIBGLADE_LIB "libglade.so.5.0" _ACEOF - + ;; diff --git a/x11/ogle_gui/patches/patch-src_my_glade_c b/x11/ogle_gui/patches/patch-src_my_glade_c index 5312a8ab4e1..ae85c2d162b 100644 --- a/x11/ogle_gui/patches/patch-src_my_glade_c +++ b/x11/ogle_gui/patches/patch-src_my_glade_c @@ -1,10 +1,10 @@ -$OpenBSD: patch-src_my_glade_c,v 1.2 2002/06/15 23:53:50 espie Exp $ +$OpenBSD: patch-src_my_glade_c,v 1.3 2003/11/13 18:48:38 espie Exp $ ---- src/my_glade.c.orig Sun Dec 16 18:50:08 2001 -+++ src/my_glade.c Sun Jun 16 01:13:28 2002 -@@ -48,6 +48,51 @@ static void *my_dlsym(void *handle, char - return fun; - } +--- src/my_glade.c.orig 2003-11-05 20:06:51.000000000 +0100 ++++ src/my_glade.c 2003-11-06 07:42:54.000000000 +0100 +@@ -70,6 +70,51 @@ static void *my_dlsym(void *handle, char + // location of the standard ogle_gui.glade file + #define OGLE_GLADE_FILE PACKAGE_PIXMAPS_DIR "/ogle_gui." GLADE_EXT +#ifdef __OpenBSD__ +#include @@ -54,7 +54,7 @@ $OpenBSD: patch-src_my_glade_c,v 1.2 2002/06/15 23:53:50 espie Exp $ // to be called first void my_glade_setup () { -@@ -60,6 +105,10 @@ void my_glade_setup () +@@ -83,6 +128,10 @@ void my_glade_setup () // next, try without path glade_lib = dlopen (LIBGLADE_LIB, RTLD_NOW); } diff --git a/x11/ogle_gui/pkg/PLIST b/x11/ogle_gui/pkg/PLIST index 3cb71ecaf26..4bef8f67064 100644 --- a/x11/ogle_gui/pkg/PLIST +++ b/x11/ogle_gui/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.4 2003/02/24 22:57:36 espie Exp $ +@comment $OpenBSD: PLIST,v 1.5 2003/11/13 18:48:38 espie Exp $ lib/ogle/ogle_gui share/locale/da/LC_MESSAGES/ogle_gui.mo share/locale/de/LC_MESSAGES/ogle_gui.mo @@ -13,6 +13,7 @@ share/ogle_gui/go_up.xpm share/ogle_gui/menus.xpm share/ogle_gui/ogle.xpm share/ogle_gui/ogle_gui.glade +share/ogle_gui/ogle_gui.glade2 share/ogle_gui/rewind.xpm share/ogle_gui/skip_backwards.xpm share/ogle_gui/skip_forwards.xpm