From 8570a0b1e89a0c2c86ae2654e9033f7cb313e8b6 Mon Sep 17 00:00:00 2001 From: jasper Date: Sat, 22 Nov 2008 11:51:37 +0000 Subject: [PATCH] - update gtk-engines to 2.16.1 * still needs some tweaking, which the frog next to me will take care of - specify license versions ok ajacoutot@ --- x11/gtk-engines2/Makefile | 10 ++-- x11/gtk-engines2/distinfo | 10 ++-- x11/gtk-engines2/patches/patch-configure | 48 ++++++++++++++++++++ x11/gtk-engines2/pkg/PLIST | 58 +----------------------- 4 files changed, 59 insertions(+), 67 deletions(-) create mode 100644 x11/gtk-engines2/patches/patch-configure diff --git a/x11/gtk-engines2/Makefile b/x11/gtk-engines2/Makefile index 058817618e9..e371a61dbfa 100644 --- a/x11/gtk-engines2/Makefile +++ b/x11/gtk-engines2/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.28 2008/04/29 17:39:01 jasper Exp $ +# $OpenBSD: Makefile,v 1.29 2008/11/22 11:51:37 jasper Exp $ SHARED_ONLY= Yes COMMENT= collection of theme engines for GTK+2 -V= 2.14.1 +V= 2.16.1 GNOME_PROJECT= gtk-engines GNOME_VERSION= ${V} PKGNAME= gtk-engines2-${V} @@ -12,7 +12,7 @@ CATEGORIES= x11 HOMEPAGE= http://www.gnome.org/ -# (L)GPLv2 +# LGPLv2.1/GPLv2 PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes @@ -20,8 +20,8 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \ - freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0 \ - pangocairo-1.0 pangoft2-1.0 png z pcre + freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 m \ + pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png z pcre LIB_DEPENDS= gdk-x11-2.0.>=1000,gdk_pixbuf-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 RUN_DEPENDS= :hicolor-icon-theme-*:x11/hicolor-icon-theme diff --git a/x11/gtk-engines2/distinfo b/x11/gtk-engines2/distinfo index cbffeb5065a..2bdda00e245 100644 --- a/x11/gtk-engines2/distinfo +++ b/x11/gtk-engines2/distinfo @@ -1,5 +1,5 @@ -MD5 (gtk-engines-2.14.1.tar.bz2) = 7vjuBnutC3a5dzrvGZSTDA== -RMD160 (gtk-engines-2.14.1.tar.bz2) = s1la228oOoAbdpQu1s0FjbsS+7s= -SHA1 (gtk-engines-2.14.1.tar.bz2) = 5HE9RN9DHIOxZARXuQq8Pdxx2bE= -SHA256 (gtk-engines-2.14.1.tar.bz2) = q0qTChpR37HvQSM5aqGHdIdRfXRxPdn8LCYu7qA3+Bk= -SIZE (gtk-engines-2.14.1.tar.bz2) = 669825 +MD5 (gtk-engines-2.16.1.tar.bz2) = rPWpeSUH0Ms7KaPOYzPQAw== +RMD160 (gtk-engines-2.16.1.tar.bz2) = cthOWk0eMjRaQCSerZV50+5zuts= +SHA1 (gtk-engines-2.16.1.tar.bz2) = 0tO6c3e3KlTO6Zy8VG4Zs/xQi0E= +SHA256 (gtk-engines-2.16.1.tar.bz2) = XOW9I9+cJkRMktQVk1Yi1fH3wclmnsUWVgfeBRJdwsE= +SIZE (gtk-engines-2.16.1.tar.bz2) = 588253 diff --git a/x11/gtk-engines2/patches/patch-configure b/x11/gtk-engines2/patches/patch-configure new file mode 100644 index 00000000000..7d1f7a7107f --- /dev/null +++ b/x11/gtk-engines2/patches/patch-configure @@ -0,0 +1,48 @@ +$OpenBSD: patch-configure,v 1.3 2008/11/22 11:51:37 jasper Exp $ +--- configure.orig Mon Oct 20 19:16:12 2008 ++++ configure Tue Oct 28 20:07:21 2008 +@@ -21778,7 +21778,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl $LIBS" ++LIBS="-lintl -liconv $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -21844,7 +21844,7 @@ if test "${ac_cv_lib_intl_ngettext+set}" = set; then + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl $LIBS" ++LIBS="-lintl -liconv $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -21910,7 +21910,7 @@ if test "${ac_cv_lib_intl_dgettext+set}" = set; then + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lintl $LIBS" ++LIBS="-lintl -liconv $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -22134,7 +22134,7 @@ fi + # + if test "$gt_cv_func_dgettext_libintl" = "yes" ; then + glib_save_LIBS="$LIBS" +- LIBS="$LIBS -lintl $libintl_extra_libs" ++ LIBS="$LIBS -lintl -liconv $libintl_extra_libs" + unset ac_cv_func_bind_textdomain_codeset + + for ac_func in bind_textdomain_codeset +@@ -22255,7 +22255,7 @@ done + fi + + if test "$gt_cv_func_dgettext_libintl" = "yes"; then +- INTLLIBS="-lintl $libintl_extra_libs" ++ INTLLIBS="-lintl -liconv $libintl_extra_libs" + fi + + if test "$gt_cv_have_gettext" = "yes"; then diff --git a/x11/gtk-engines2/pkg/PLIST b/x11/gtk-engines2/pkg/PLIST index 2fb6f500c40..16de6a3d801 100644 --- a/x11/gtk-engines2/pkg/PLIST +++ b/x11/gtk-engines2/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.20 2008/04/29 17:39:01 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.21 2008/11/22 11:51:37 jasper Exp $ @conflict gtk-thinice-engine-* @conflict gtk2-clearlooks-engine-* @conflict gnome-themes-<2.10 @@ -23,9 +23,6 @@ lib/gtk-2.0/2.10.0/engines/libmist.so lib/gtk-2.0/2.10.0/engines/libredmond95.a lib/gtk-2.0/2.10.0/engines/libredmond95.la lib/gtk-2.0/2.10.0/engines/libredmond95.so -lib/gtk-2.0/2.10.0/engines/libsmooth.a -lib/gtk-2.0/2.10.0/engines/libsmooth.la -lib/gtk-2.0/2.10.0/engines/libsmooth.so lib/gtk-2.0/2.10.0/engines/libthinice.a lib/gtk-2.0/2.10.0/engines/libthinice.la lib/gtk-2.0/2.10.0/engines/libthinice.so @@ -38,60 +35,7 @@ share/gtk-engines/hcengine.xml share/gtk-engines/industrial.xml share/gtk-engines/mist.xml share/gtk-engines/redmond95.xml -share/gtk-engines/smooth.xml share/gtk-engines/thinice.xml -share/locale/ar/LC_MESSAGES/gtk-engines.mo -share/locale/be@latin/LC_MESSAGES/gtk-engines.mo -share/locale/bg/LC_MESSAGES/gtk-engines.mo -share/locale/bn_IN/LC_MESSAGES/gtk-engines.mo -share/locale/ca/LC_MESSAGES/gtk-engines.mo -share/locale/cs/LC_MESSAGES/gtk-engines.mo -share/locale/da/LC_MESSAGES/gtk-engines.mo -share/locale/de/LC_MESSAGES/gtk-engines.mo -share/locale/dz/LC_MESSAGES/gtk-engines.mo -share/locale/el/LC_MESSAGES/gtk-engines.mo -share/locale/en_GB/LC_MESSAGES/gtk-engines.mo -share/locale/es/LC_MESSAGES/gtk-engines.mo -share/locale/et/LC_MESSAGES/gtk-engines.mo -share/locale/eu/LC_MESSAGES/gtk-engines.mo -share/locale/fi/LC_MESSAGES/gtk-engines.mo -share/locale/fr/LC_MESSAGES/gtk-engines.mo -share/locale/gl/LC_MESSAGES/gtk-engines.mo -share/locale/gu/LC_MESSAGES/gtk-engines.mo -share/locale/he/LC_MESSAGES/gtk-engines.mo -share/locale/hi/LC_MESSAGES/gtk-engines.mo -share/locale/hu/LC_MESSAGES/gtk-engines.mo -share/locale/it/LC_MESSAGES/gtk-engines.mo -share/locale/ja/LC_MESSAGES/gtk-engines.mo -share/locale/ko/LC_MESSAGES/gtk-engines.mo -share/locale/lt/LC_MESSAGES/gtk-engines.mo -share/locale/mk/LC_MESSAGES/gtk-engines.mo -share/locale/ml/LC_MESSAGES/gtk-engines.mo -share/locale/mr/LC_MESSAGES/gtk-engines.mo -share/locale/nb/LC_MESSAGES/gtk-engines.mo -share/locale/nl/LC_MESSAGES/gtk-engines.mo -share/locale/nn/LC_MESSAGES/gtk-engines.mo -share/locale/oc/LC_MESSAGES/gtk-engines.mo -share/locale/or/LC_MESSAGES/gtk-engines.mo -share/locale/pa/LC_MESSAGES/gtk-engines.mo -share/locale/pl/LC_MESSAGES/gtk-engines.mo -share/locale/pt/LC_MESSAGES/gtk-engines.mo -share/locale/pt_BR/LC_MESSAGES/gtk-engines.mo -share/locale/ru/LC_MESSAGES/gtk-engines.mo -share/locale/si/LC_MESSAGES/gtk-engines.mo -share/locale/sl/LC_MESSAGES/gtk-engines.mo -share/locale/sq/LC_MESSAGES/gtk-engines.mo -share/locale/sr/LC_MESSAGES/gtk-engines.mo -share/locale/sr@Latn/LC_MESSAGES/gtk-engines.mo -share/locale/sv/LC_MESSAGES/gtk-engines.mo -share/locale/ta/LC_MESSAGES/gtk-engines.mo -share/locale/th/LC_MESSAGES/gtk-engines.mo -share/locale/tr/LC_MESSAGES/gtk-engines.mo -share/locale/uk/LC_MESSAGES/gtk-engines.mo -share/locale/vi/LC_MESSAGES/gtk-engines.mo -share/locale/zh_CN/LC_MESSAGES/gtk-engines.mo -share/locale/zh_HK/LC_MESSAGES/gtk-engines.mo -share/locale/zh_TW/LC_MESSAGES/gtk-engines.mo share/themes/Clearlooks/ share/themes/Clearlooks/gtk-2.0/ share/themes/Clearlooks/gtk-2.0/gtkrc