diff options
Diffstat (limited to 'x11-toolkits/py-gnome-extras')
| -rw-r--r-- | x11-toolkits/py-gnome-extras/Makefile | 8 | ||||
| -rw-r--r-- | x11-toolkits/py-gnome-extras/distinfo | 6 | ||||
| -rw-r--r-- | x11-toolkits/py-gnome-extras/files/patch-configure | 679 | ||||
| -rw-r--r-- | x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs | 67 | ||||
| -rw-r--r-- | x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override | 10 | ||||
| -rw-r--r-- | x11-toolkits/py-gnome-extras/pkg-plist | 21 |
6 files changed, 677 insertions, 114 deletions
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile index e494fff56031..8acb4662d2a2 100644 --- a/x11-toolkits/py-gnome-extras/Makefile +++ b/x11-toolkits/py-gnome-extras/Makefile @@ -3,12 +3,12 @@ # Whom: Koop Mast <kwm@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.45 2008/10/21 14:16:43 kwm Exp $ +# $MCom: ports/x11-toolkits/py-gnome-extras/Makefile,v 1.48 2009/04/07 03:08:53 marcus Exp $ # PORTNAME= gnome -PORTVERSION= 2.19.1 -PORTREVISION= 5 +PORTVERSION= 2.25.3 +PORTREVISION= 1 CATEGORIES= x11-toolkits python gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//} @@ -29,7 +29,7 @@ USE_GECKO= firefox seamonkey xulrunner mozilla USE_BZIP2= yes USE_GMAKE= yes USE_PYTHON= yes -USE_GNOME= gnomehack libgtkhtml pygnome2 libgda3 +USE_GNOME= gnomehack libgtkhtml pygnome2 libgda4 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-gtkmozembed=${GECKO} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11-toolkits/py-gnome-extras/distinfo b/x11-toolkits/py-gnome-extras/distinfo index c16b77d8ddb3..71fc1395ff05 100644 --- a/x11-toolkits/py-gnome-extras/distinfo +++ b/x11-toolkits/py-gnome-extras/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/gnome-python-extras-2.19.1.tar.bz2) = 08896c63d71ce44d20fafbaf9c0edc78 -SHA256 (gnome2/gnome-python-extras-2.19.1.tar.bz2) = c5f74f4c46dbb379d119d6f74ca4a47653af251bea176dc7a0ecacccb88339f0 -SIZE (gnome2/gnome-python-extras-2.19.1.tar.bz2) = 361721 +MD5 (gnome2/gnome-python-extras-2.25.3.tar.bz2) = 9f3b7ec5c57130b96061cb486b79c076 +SHA256 (gnome2/gnome-python-extras-2.25.3.tar.bz2) = ca346264e00e193f0866cabd8801d3b7ce70dae7b8b296e41e5b3a45c9b0275c +SIZE (gnome2/gnome-python-extras-2.25.3.tar.bz2) = 370489 diff --git a/x11-toolkits/py-gnome-extras/files/patch-configure b/x11-toolkits/py-gnome-extras/files/patch-configure index 407ce7f1767c..04f5b256944c 100644 --- a/x11-toolkits/py-gnome-extras/files/patch-configure +++ b/x11-toolkits/py-gnome-extras/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sun Feb 25 16:31:03 2007 -+++ configure Sat Jul 21 20:04:43 2007 -@@ -1550,7 +1550,7 @@ +--- configure.orig 2009-02-28 16:14:05.000000000 -0500 ++++ configure 2009-02-28 16:21:48.000000000 -0500 +@@ -1721,7 +1721,7 @@ Optional Packages: --with-pic try to use only PIC/non-PIC objects [default=use both] --with-tags[=TAGS] include additional configurations [automatic] @@ -9,14 +9,667 @@ package that provides libgtkmozembed Some influential environment variables: -@@ -22072,8 +22072,9 @@ - xulrunner) mozpackage_required_version=1.8 ;; - firefox) mozpackage_required_version=1.0 ;; - mozilla) mozpackage_required_version=1.2b ;; -+ seamonkey) mozpackage_required_version=1.1.3 ;; - *) { { echo "$as_me:$LINENO: error: --with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'" >&5 --echo "$as_me: error: --with-gtkmozembed argument must be either 'mozilla', 'firefox', or 'xulrunner'" >&2;} -+echo "$as_me: error: --with-gtkmozembed argument must be either 'mozilla', 'firefox', 'seamonkey' or 'xulrunner'" >&2;} - { (exit 1); exit 1; }; } - esac +@@ -22428,6 +22428,150 @@ fi + + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ build_gtkmozembed=false ++elif test $pkg_failed = untried; then ++ build_gtkmozembed=false ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++elif test $pkg_failed = untried; then ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + build_gtkmozembed=false + elif test $pkg_failed = untried; then + build_gtkmozembed=false +@@ -22436,6 +22580,14 @@ else + GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + build_gtkmozembed=true; mozpackage=mozilla + fi + +@@ -22506,6 +22658,150 @@ fi + + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ build_gtkmozembed=false ++elif test $pkg_failed = untried; then ++ build_gtkmozembed=false ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++elif test $pkg_failed = untried; then ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + build_gtkmozembed=false + elif test $pkg_failed = untried; then + build_gtkmozembed=false +@@ -22514,6 +22810,14 @@ else + GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + build_gtkmozembed=true; mozpackage=mozilla + fi + +@@ -22658,6 +22962,150 @@ fi + + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ build_gtkmozembed=false ++elif test $pkg_failed = untried; then ++ build_gtkmozembed=false ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++elif test $pkg_failed = untried; then ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + build_gtkmozembed=false + elif test $pkg_failed = untried; then + build_gtkmozembed=false +@@ -22666,6 +23114,14 @@ else + GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + build_gtkmozembed=true; mozpackage=mozilla + fi + +@@ -22736,6 +23192,150 @@ fi + + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } ++ build_gtkmozembed=false ++elif test $pkg_failed = untried; then ++ build_gtkmozembed=false ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++elif test $pkg_failed = untried; then ++ ++ ++pkg_failed=no ++{ $as_echo "$as_me:$LINENO: checking for GTKMOZEMBED" >&5 ++$as_echo_n "checking for GTKMOZEMBED... " >&6; } ++ ++if test -n "$GTKMOZEMBED_CFLAGS"; then ++ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_CFLAGS=`$PKG_CONFIG --cflags "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GTKMOZEMBED_LIBS"; then ++ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ pkg_cv_GTKMOZEMBED_LIBS=`$PKG_CONFIG --libs "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ else ++ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "seamonkey-gtkmozembed >= 1.1.3 ++ gtk+-2.0 >= 2.4.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GTKMOZEMBED_PKG_ERRORS" >&5 ++ ++ { $as_echo "$as_me:$LINENO: result: no" >&5 ++$as_echo "no" >&6; } + build_gtkmozembed=false + elif test $pkg_failed = untried; then + build_gtkmozembed=false +@@ -22744,6 +23344,14 @@ else + GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS + { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "yes" >&6; } ++ build_gtkmozembed=true; mozpackage=seamonkey ++fi ++ ++else ++ GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS ++ GTKMOZEMBED_LIBS=$pkg_cv_GTKMOZEMBED_LIBS ++ { $as_echo "$as_me:$LINENO: result: yes" >&5 ++$as_echo "yes" >&6; } + build_gtkmozembed=true; mozpackage=mozilla + fi diff --git a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs b/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs deleted file mode 100644 index b0b5dae6237e..000000000000 --- a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.defs +++ /dev/null @@ -1,67 +0,0 @@ ---- gdl/gdl.defs.orig 2007-06-05 14:52:30.000000000 +0000 -+++ gdl/gdl.defs 2008-10-21 15:47:07.000000000 +0000 -@@ -81,17 +81,6 @@ - (gtype-id "GDL_TYPE_DOCK_TABLABEL") - ) - --(ifdef HAVE_GDL_0_7 -- --(define-object Icons -- (in-module "Gdl") -- (parent "GObject") -- (c-name "GdlIcons") -- (gtype-id "GDL_TYPE_ICONS") --) -- --) ; ifdef HAVE_GDL_0_7 -- - ;; Enumerations and flags ... - - (ifdef HAVE_GDL_0_7 -@@ -924,46 +913,3 @@ - (return-type "none") - ) - --;; From gdl-icons.h -- --(ifdef HAVE_GDL_0_7 -- --(define-function gdl_icons_new -- (is-constructor-of "GdlIcons") -- (c-name "gdl_icons_new") -- (return-type "GdlIcons*") -- (parameters -- '("int" "icon_size") -- ) --) -- --(define-function gdl_icons_get_type -- (c-name "gdl_icons_get_type") -- (return-type "GType") --) -- --(define-method get_folder_icon -- (of-object "GdlIcons") -- (c-name "gdl_icons_get_folder_icon") -- (return-type "GdkPixbuf*") --) -- --(define-method get_uri_icon -- (of-object "GdlIcons") -- (c-name "gdl_icons_get_uri_icon") -- (return-type "GdkPixbuf*") -- (parameters -- '("const-char*" "uri") -- ) --) -- --(define-method get_mime_icon -- (of-object "GdlIcons") -- (c-name "gdl_icons_get_mime_icon") -- (return-type "GdkPixbuf*") -- (parameters -- '("const-char*" "mime_type") -- ) --) -- --) ; ifdef HAVE_GDL_0_7 diff --git a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override b/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override deleted file mode 100644 index 16e67fe1efc5..000000000000 --- a/x11-toolkits/py-gnome-extras/files/patch-gdl_gdl.override +++ /dev/null @@ -1,10 +0,0 @@ ---- gdl/gdl.override.orig 2007-06-05 14:52:30.000000000 +0000 -+++ gdl/gdl.override 2008-10-21 15:47:07.000000000 +0000 -@@ -6,7 +6,6 @@ headers - #include <pygtk/pygtk.h> - #include <gdl/gdl-dock.h> - #include <gdl/libgdltypebuiltins.h> --#include <gdl/gdl-icons.h> - #ifndef HAVE_GDL_0_7 - # include <gdl/gdl-dock-bar.h> - #endif diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist index 012275817bae..8564adea3250 100644 --- a/x11-toolkits/py-gnome-extras/pkg-plist +++ b/x11-toolkits/py-gnome-extras/pkg-plist @@ -1,4 +1,4 @@ -include/pygda-3.0/pygdavalue_conversions.h +include/pygda-4.0/pygdavalue_conversions.h %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.py %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyc %%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyo @@ -24,17 +24,7 @@ include/pygda-3.0/pygdavalue_conversions.h %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.la %%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.so libdata/pkgconfig/gnome-python-extras-2.0.pc -libdata/pkgconfig/pygda-3.0.pc -%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/class-gtkmozembed.html -%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/gtkmozembed-class-reference.html -%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.html -%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/index.sgml -%%PORTDOCS%%%%DOCSDIR%%/pygtkmozembed/pygtkmozembed.devhelp -%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/class-gtkspell.html -%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/gtkspell-class-reference.html -%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.html -%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/index.sgml -%%PORTDOCS%%%%DOCSDIR%%/pygtkspell/pygtkspell.devhelp +libdata/pkgconfig/pygda-4.0.pc %%PORTDOCS%%share/examples/py-gnome/egg/recent/Bonobo_Sample_Hello.xml %%PORTDOCS%%share/examples/py-gnome/egg/recent/bonobo-view.py %%PORTDOCS%%share/examples/py-gnome/egg/recent/gtk-view.py @@ -45,7 +35,7 @@ libdata/pkgconfig/pygda-3.0.pc %%PORTDOCS%%share/examples/py-gnome/gdl/gdl_test.py %%PORTDOCS%%share/examples/py-gnome/gksu2/simple.py %%PORTDOCS%%share/examples/py-gnome/gtkhtml2/simple-browser.py -%%PORTDOCS%%share/examples/py-gnome/gtkspell/gtkspell.py +%%PORTDOCS%%share/examples/py-gnome/gtkspell/spell.py %%PORTDOCS%%share/examples/py-gnome/gtkspell/test.py share/pygtk/2.0/argtypes/gda-arg-types.py share/pygtk/2.0/argtypes/gda-arg-types.pyc @@ -60,9 +50,6 @@ share/pygtk/2.0/defs/trayicon.defs %%PORTDOCS%%@dirrm share/examples/py-gnome/gdl %%PORTDOCS%%@dirrm share/examples/py-gnome/egg/recent %%PORTDOCS%%@dirrm share/examples/py-gnome/egg -%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkspell -%%PORTDOCS%%@dirrm %%DOCSDIR%%/pygtkmozembed -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/gksu @dirrm %%PYTHON_SITELIBDIR%%/gtk-2.0/egg -@dirrm include/pygda-3.0 +@dirrm include/pygda-4.0 |