[107414] trunk/dports/gnome/libgnomeui

27 Jun 2013

Revision: 107414
          https://trac.macports.org/changeset/107414
Author:   devans@macports.org
Date:     2013-06-27 15:49:23 -0700 (Thu, 27 Jun 2013)
Log Message:
-----------
libgnomeui: prevent opportunistic linking with libSM when +no_x11 (-x11) is asserted, dependencies.

Modified Paths:
--------------
    trunk/dports/gnome/libgnomeui/Portfile

Added Paths:
-----------
    trunk/dports/gnome/libgnomeui/files/patch-configure.in.diff

Removed Paths:
-------------
    trunk/dports/gnome/libgnomeui/files/patch-configure.diff

Modified: trunk/dports/gnome/libgnomeui/Portfile
===================================================================

--- trunk/dports/gnome/libgnomeui/Portfile	2013-06-27 22:27:00 UTC (rev 107413)
+++ trunk/dports/gnome/libgnomeui/Portfile	2013-06-27 22:49:23 UTC (rev 107414)
@@ -5,7 +5,7 @@
 
 name            libgnomeui
 version         2.24.5
-revision        8
+revision        9
 set branch      [join [lrange [split ${version} .] 0 1] .]
 maintainers     nomaintainer
 categories      gnome
@@ -26,7 +26,8 @@
 
 depends_build   port:pkgconfig \
                 port:intltool \
-                port:gtk-doc
+                port:gtk-doc \
+                port:gnome-common
 
 depends_lib     port:gconf \
                 port:libbonoboui \
@@ -34,8 +35,10 @@
                 port:libgnome-keyring \
                 port:libpng
 
-patchfiles      patch-configure.diff
+patchfiles      patch-configure.in.diff
 
+use_autoreconf  yes
+
 configure.env   INTLTOOL_PERL=${prefix}/bin/perl5.12
 configure.args  --without-x
 
@@ -43,8 +46,12 @@
 variant no_x11 conflicts x11 description {Legacy compatibility variant} {}
 
 variant x11 conflicts no_x11 {
-    patchfiles-delete       patch-configure.diff
-    depends_lib-append      port:xorg-libsm
+    patchfiles-delete       patch-configure.in.diff
+    depends_build-delete    gnome-common
+    depends_lib-append      port:xorg-libsm \
+                            port:xorg-libice \
+                            port:xorg-libX11
+    use_autoreconf          no
     configure.args-append   --x-includes=${prefix}/include \
                             --x-libraries=${prefix}/lib
     configure.args-delete   --without-x

Deleted: trunk/dports/gnome/libgnomeui/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/libgnomeui/files/patch-configure.diff	2013-06-27 22:27:00 UTC (rev 107413)
+++ trunk/dports/gnome/libgnomeui/files/patch-configure.diff	2013-06-27 22:49:23 UTC (rev 107414)
@@ -1,15 +0,0 @@
---- configure.orig	2010-10-02 23:33:41.000000000 -0700
-+++ configure	2010-10-02 23:34:29.000000000 -0700
-@@ -13839,9 +13839,9 @@
-     gnome_keyring_requirement="gnome-keyring-1 >= 0.4"
-     GNOME_KEYRING="gnome-keyring-1"
- 
--    if test x$GNOME_HAVE_X11 != xyes ; then
--        as_fn_error $? "libX11 not found" "$LINENO" 5
--    fi
-+ #   if test x$GNOME_HAVE_X11 != xyes ; then
-+ #       as_fn_error $? "libX11 not found" "$LINENO" 5
-+ #   fi
-     ;;
- esac
-  if test "$os_win32" = "yes"; then

Added: trunk/dports/gnome/libgnomeui/files/patch-configure.in.diff
===================================================================
--- trunk/dports/gnome/libgnomeui/files/patch-configure.in.diff	                        (rev 0)
+++ trunk/dports/gnome/libgnomeui/files/patch-configure.in.diff	2013-06-27 22:49:23 UTC (rev 107414)
@@ -0,0 +1,75 @@
+--- configure.in.orig	2013-06-27 13:21:24.000000000 -0700
++++ configure.in	2013-06-27 13:25:22.000000000 -0700
+@@ -118,9 +118,9 @@
+     gnome_keyring_requirement="gnome-keyring-1 >= gnome_keyring_required_version"
+     GNOME_KEYRING="gnome-keyring-1"
+ 
+-    if test x$GNOME_HAVE_X11 != xyes ; then
+-        AC_MSG_ERROR([libX11 not found])
+-    fi
++#    if test x$GNOME_HAVE_X11 != xyes ; then
++#        AC_MSG_ERROR([libX11 not found])
++#    fi
+     ;;
+ esac
+ AM_CONDITIONAL(OS_WIN32, [test "$os_win32" = "yes"])
+@@ -142,34 +142,34 @@
+ dnl Check for -lSM (for gnome-client)
+ dnl
+ 
+-GNOME_HAVE_SM=true
+-PKG_CHECK_MODULES(SM, sm ice, :, [
++# GNOME_HAVE_SM=true
++# PKG_CHECK_MODULES(SM, sm ice, :, [
+ # pkg-config modules not found (only present since X11R7); use old-style
+ # detection
+-AC_PATH_XTRA
++# AC_PATH_XTRA
+ # X found
+-if test x$no_x != xyes ; then
+-    libgnomeui_save_cflags="$CFLAGS"
+-    libgnomeui_save_libs="$LIBS"
+-    CFLAGS="$X_CFLAGS"
+-    LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
+-    AC_CHECK_LIB(SM,
+-                 SmcSaveYourselfDone,
+-                 [SM_CFLAGS="$X_CFLAGS"
+-                  SM_LIBS="$X_PRE_LIBS $X_LIBS -lSM -lICE $X_EXTRA_LIBS"],
+-                 GNOME_HAVE_SM=false,
+-                 $X_LIBS -lICE)
+-    AC_CHECK_HEADERS(X11/SM/SMlib.h, :, GNOME_HAVE_SM=false)
+-    CFLAGS="$libgnomeui_save_cflags"
+-    LIBS="$libgnomeui_save_libs"
+-else
+-    GNOME_HAVE_SM=false
+-fi
+-])
+-
+-if test "$GNOME_HAVE_SM" = true; then
+-	AC_DEFINE(HAVE_LIBSM, 1, [Define to 1 if you have libSM installed])
+-fi
++# if test x$no_x != xyes ; then
++#     libgnomeui_save_cflags="$CFLAGS"
++#     libgnomeui_save_libs="$LIBS"
++#     CFLAGS="$X_CFLAGS"
++#     LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
++#     AC_CHECK_LIB(SM,
++#                  SmcSaveYourselfDone,
++#                  [SM_CFLAGS="$X_CFLAGS"
++#                  SM_LIBS="$X_PRE_LIBS $X_LIBS -lSM -lICE $X_EXTRA_LIBS"],
++#                 GNOME_HAVE_SM=false,
++#                 $X_LIBS -lICE)
++#    AC_CHECK_HEADERS(X11/SM/SMlib.h, :, GNOME_HAVE_SM=false)
++#    CFLAGS="$libgnomeui_save_cflags"
++#    LIBS="$libgnomeui_save_libs"
++# else
++#    GNOME_HAVE_SM=false
++# fi
++# ])
++#
++# if test "$GNOME_HAVE_SM" = true; then
++#	AC_DEFINE(HAVE_LIBSM, 1, [Define to 1 if you have libSM installed])
++# fi
+ 
+ dnl
+ dnl Start of pkg-config checks

    

devans＠macports.org

tags

participants (1)