From fd95f9b2d1fa96df8d7b4eaf9aeafa942bf1b0f0 Mon Sep 17 00:00:00 2001 From: jasper Date: Sun, 15 May 2011 09:22:36 +0000 Subject: [PATCH] - switch by default to gtk3, and add a gtk2 flavor for current users of gucharmap. discussed with/ok aja@ --- x11/gnome/gucharmap/Makefile | 41 ++++++++++++++--------- x11/gnome/gucharmap/pkg/PFRAG.gtk2 | 44 ++++++++++++++++++++++++ x11/gnome/gucharmap/pkg/PFRAG.no_gtk2 | 21 ++++++++++++ x11/gnome/gucharmap/pkg/PLIST | 48 ++------------------------- 4 files changed, 93 insertions(+), 61 deletions(-) create mode 100644 x11/gnome/gucharmap/pkg/PFRAG.gtk2 create mode 100644 x11/gnome/gucharmap/pkg/PFRAG.no_gtk2 diff --git a/x11/gnome/gucharmap/Makefile b/x11/gnome/gucharmap/Makefile index b8ec5e1b98b..7395c62c443 100644 --- a/x11/gnome/gucharmap/Makefile +++ b/x11/gnome/gucharmap/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.43 2011/05/14 21:29:03 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.44 2011/05/15 09:22:36 jasper Exp $ SHARED_ONLY= Yes @@ -6,10 +6,7 @@ COMMENT= Unicode character map for the GNOME project GNOME_PROJECT= gucharmap GNOME_VERSION= 3.0.1 - -REVISION= 0 - -SHARED_LIBS += gucharmap 2.0 # .7.0 +REVISION= 1 HOMEPAGE= http://live.gnome.org/Gucharmap @@ -19,13 +16,13 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext -WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo -WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 -WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 -WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb z -WANTLIB += xcb-render GL Xxf86vm drm xcb-shm +WANTLIB += GL ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp +WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 +WANTLIB += c cairo drm expat fontconfig freetype +WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 +WANTLIB += gthread-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 +WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb xcb-render +WANTLIB += xcb-shm z MODULES= devel/gettext \ x11/gnome \ @@ -33,8 +30,6 @@ MODULES= devel/gettext \ BUILD_DEPENDS= devel/gobject-introspection -LIB_DEPENDS= x11/gtk+2 - # XXX: the libtool wrapper script is passed as argument to g-ir-scanner, # instead of the actual library USE_LIBTOOL= gnu @@ -43,9 +38,23 @@ MODGNOME_HELP_FILES= Yes DESKTOP_FILES= Yes MODGCONF2_SCHEMAS_DIR= gucharmap +FLAVORS= gtk2 +FLAVOR?= + +.if ${FLAVOR:L:Mgtk2} +SHARED_LIBS += gucharmap 2.0 # .7.0 +CONFIGURE_ARGS+= --with-gtk=2.0 +LIB_DEPENDS+= x11/gtk+2,-main +WANTLIB+= gdk-x11-2.0 gtk-x11-2.0 +.else +SHARED_LIBS += gucharmap_2_90 0.0 # 7.0 +CONFIGURE_ARGS+= --with-gtk=3.0 +LIB_DEPENDS+= x11/gtk+3,-main +WANTLIB+= cairo-gobject gdk-3 gtk-3 +.endif + CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ - --enable-introspection \ - --with-gtk=2.0 + --enable-introspection CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnome/gucharmap/pkg/PFRAG.gtk2 b/x11/gnome/gucharmap/pkg/PFRAG.gtk2 new file mode 100644 index 00000000000..bd9c21615b2 --- /dev/null +++ b/x11/gnome/gucharmap/pkg/PFRAG.gtk2 @@ -0,0 +1,44 @@ +@comment $OpenBSD: PFRAG.gtk2,v 1.1 2011/05/15 09:22:36 jasper Exp $ +@pkgpath x11/gnome/gucharmap +include/gucharmap-2.0/ +include/gucharmap-2.0/gucharmap/ +include/gucharmap-2.0/gucharmap/gucharmap-block-chapters-model.h +include/gucharmap-2.0/gucharmap/gucharmap-block-codepoint-list.h +include/gucharmap-2.0/gucharmap/gucharmap-chapters-model.h +include/gucharmap-2.0/gucharmap/gucharmap-chapters-view.h +include/gucharmap-2.0/gucharmap/gucharmap-charmap.h +include/gucharmap-2.0/gucharmap/gucharmap-chartable.h +include/gucharmap-2.0/gucharmap/gucharmap-codepoint-list.h +include/gucharmap-2.0/gucharmap/gucharmap-script-chapters-model.h +include/gucharmap-2.0/gucharmap/gucharmap-script-codepoint-list.h +include/gucharmap-2.0/gucharmap/gucharmap-type-builtins.h +include/gucharmap-2.0/gucharmap/gucharmap-unicode-info.h +include/gucharmap-2.0/gucharmap/gucharmap.h +lib/girepository-1.0/Gucharmap-2.0.typelib +@lib lib/libgucharmap.so.${LIBgucharmap_VERSION} +lib/pkgconfig/gucharmap-2.pc +share/gir-1.0/Gucharmap-2.0.gir +share/gnome/help/gucharmap/it/ +share/gnome/help/gucharmap/it/figures/ +share/gnome/help/gucharmap/it/figures/gucharmap_window.png +share/gnome/help/gucharmap/it/gucharmap.xml +share/gnome/help/gucharmap/it/legal.xml +share/gnome/help/gucharmap/ja/ +share/gnome/help/gucharmap/ja/figures/ +share/gnome/help/gucharmap/ja/figures/gucharmap_window.png +share/gnome/help/gucharmap/ja/gucharmap.xml +share/gnome/help/gucharmap/ja/legal.xml +share/gnome/help/gucharmap/zh_HK/ +share/gnome/help/gucharmap/zh_HK/figures/ +share/gnome/help/gucharmap/zh_HK/figures/gucharmap_window.png +share/gnome/help/gucharmap/zh_HK/gucharmap.xml +share/gnome/help/gucharmap/zh_HK/legal.xml +share/gnome/help/gucharmap/zh_TW/ +share/gnome/help/gucharmap/zh_TW/figures/ +share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png +share/gnome/help/gucharmap/zh_TW/gucharmap.xml +share/gnome/help/gucharmap/zh_TW/legal.xml +share/omf/gucharmap/gucharmap-it.omf +share/omf/gucharmap/gucharmap-ja.omf +share/omf/gucharmap/gucharmap-zh_HK.omf +share/omf/gucharmap/gucharmap-zh_TW.omf diff --git a/x11/gnome/gucharmap/pkg/PFRAG.no_gtk2 b/x11/gnome/gucharmap/pkg/PFRAG.no_gtk2 new file mode 100644 index 00000000000..002cd97c38a --- /dev/null +++ b/x11/gnome/gucharmap/pkg/PFRAG.no_gtk2 @@ -0,0 +1,21 @@ +@comment $OpenBSD: PFRAG.no_gtk2,v 1.1 2011/05/15 09:22:36 jasper Exp $ +include/gucharmap-2.90/ +include/gucharmap-2.90/gucharmap/ +include/gucharmap-2.90/gucharmap/gucharmap-block-chapters-model.h +include/gucharmap-2.90/gucharmap/gucharmap-block-codepoint-list.h +include/gucharmap-2.90/gucharmap/gucharmap-chapters-model.h +include/gucharmap-2.90/gucharmap/gucharmap-chapters-view.h +include/gucharmap-2.90/gucharmap/gucharmap-charmap.h +include/gucharmap-2.90/gucharmap/gucharmap-chartable.h +include/gucharmap-2.90/gucharmap/gucharmap-codepoint-list.h +include/gucharmap-2.90/gucharmap/gucharmap-script-chapters-model.h +include/gucharmap-2.90/gucharmap/gucharmap-script-codepoint-list.h +include/gucharmap-2.90/gucharmap/gucharmap-type-builtins.h +include/gucharmap-2.90/gucharmap/gucharmap-unicode-info.h +include/gucharmap-2.90/gucharmap/gucharmap.h +lib/girepository-1.0/Gucharmap-2.90.typelib +lib/libgucharmap_2_90.a +lib/libgucharmap_2_90.la +@lib lib/libgucharmap_2_90.so.${LIBgucharmap_2_90_VERSION} +lib/pkgconfig/gucharmap-2.90.pc +share/gir-1.0/Gucharmap-2.90.gir diff --git a/x11/gnome/gucharmap/pkg/PLIST b/x11/gnome/gucharmap/pkg/PLIST index 290e5b81c6b..67b59dad2c1 100644 --- a/x11/gnome/gucharmap/pkg/PLIST +++ b/x11/gnome/gucharmap/pkg/PLIST @@ -1,28 +1,10 @@ -@comment $OpenBSD: PLIST,v 1.18 2011/05/14 12:36:18 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.19 2011/05/15 09:22:36 jasper Exp $ bin/charmap bin/gnome-character-map @bin bin/gucharmap -include/gucharmap-2.0/ -include/gucharmap-2.0/gucharmap/ -include/gucharmap-2.0/gucharmap/gucharmap-block-chapters-model.h -include/gucharmap-2.0/gucharmap/gucharmap-block-codepoint-list.h -include/gucharmap-2.0/gucharmap/gucharmap-chapters-model.h -include/gucharmap-2.0/gucharmap/gucharmap-chapters-view.h -include/gucharmap-2.0/gucharmap/gucharmap-charmap.h -include/gucharmap-2.0/gucharmap/gucharmap-chartable.h -include/gucharmap-2.0/gucharmap/gucharmap-codepoint-list.h -include/gucharmap-2.0/gucharmap/gucharmap-script-chapters-model.h -include/gucharmap-2.0/gucharmap/gucharmap-script-codepoint-list.h -include/gucharmap-2.0/gucharmap/gucharmap-type-builtins.h -include/gucharmap-2.0/gucharmap/gucharmap-unicode-info.h -include/gucharmap-2.0/gucharmap/gucharmap.h -lib/girepository-1.0/Gucharmap-2.0.typelib -lib/libgucharmap.a -lib/libgucharmap.la -@lib lib/libgucharmap.so.${LIBgucharmap_VERSION} -lib/pkgconfig/gucharmap-2.pc +!%%gtk2%% +%%gtk2%% share/applications/gucharmap.desktop -share/gir-1.0/Gucharmap-2.0.gir share/gnome/help/gucharmap/ share/gnome/help/gucharmap/C/ share/gnome/help/gucharmap/C/figures/ @@ -75,16 +57,6 @@ share/gnome/help/gucharmap/fr/figures/ share/gnome/help/gucharmap/fr/figures/gucharmap_start_window.png share/gnome/help/gucharmap/fr/figures/gucharmap_window.png share/gnome/help/gucharmap/fr/gucharmap.xml -share/gnome/help/gucharmap/it/ -share/gnome/help/gucharmap/it/figures/ -share/gnome/help/gucharmap/it/figures/gucharmap_window.png -share/gnome/help/gucharmap/it/gucharmap.xml -share/gnome/help/gucharmap/it/legal.xml -share/gnome/help/gucharmap/ja/ -share/gnome/help/gucharmap/ja/figures/ -share/gnome/help/gucharmap/ja/figures/gucharmap_window.png -share/gnome/help/gucharmap/ja/gucharmap.xml -share/gnome/help/gucharmap/ja/legal.xml share/gnome/help/gucharmap/ko/ share/gnome/help/gucharmap/ko/figures/ share/gnome/help/gucharmap/ko/figures/gucharmap_start_window.png @@ -125,16 +97,6 @@ share/gnome/help/gucharmap/zh_CN/figures/ share/gnome/help/gucharmap/zh_CN/figures/gucharmap_start_window.png share/gnome/help/gucharmap/zh_CN/figures/gucharmap_window.png share/gnome/help/gucharmap/zh_CN/gucharmap.xml -share/gnome/help/gucharmap/zh_HK/ -share/gnome/help/gucharmap/zh_HK/figures/ -share/gnome/help/gucharmap/zh_HK/figures/gucharmap_window.png -share/gnome/help/gucharmap/zh_HK/gucharmap.xml -share/gnome/help/gucharmap/zh_HK/legal.xml -share/gnome/help/gucharmap/zh_TW/ -share/gnome/help/gucharmap/zh_TW/figures/ -share/gnome/help/gucharmap/zh_TW/figures/gucharmap_window.png -share/gnome/help/gucharmap/zh_TW/gucharmap.xml -share/gnome/help/gucharmap/zh_TW/legal.xml share/locale/af/LC_MESSAGES/gucharmap.mo share/locale/am/LC_MESSAGES/gucharmap.mo share/locale/ar/LC_MESSAGES/gucharmap.mo @@ -232,8 +194,6 @@ share/omf/gucharmap/gucharmap-en_GB.omf share/omf/gucharmap/gucharmap-es.omf share/omf/gucharmap/gucharmap-fi.omf share/omf/gucharmap/gucharmap-fr.omf -share/omf/gucharmap/gucharmap-it.omf -share/omf/gucharmap/gucharmap-ja.omf share/omf/gucharmap/gucharmap-ko.omf share/omf/gucharmap/gucharmap-oc.omf share/omf/gucharmap/gucharmap-pt_BR.omf @@ -242,8 +202,6 @@ share/omf/gucharmap/gucharmap-sl.omf share/omf/gucharmap/gucharmap-sv.omf share/omf/gucharmap/gucharmap-vi.omf share/omf/gucharmap/gucharmap-zh_CN.omf -share/omf/gucharmap/gucharmap-zh_HK.omf -share/omf/gucharmap/gucharmap-zh_TW.omf @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null ${SCHEMAS_INSTDIR}/ ${SCHEMAS_INSTDIR}/gucharmap.schemas