[pkgsrc/trunk]: pkgsrc/x11/gnome-desktop3 Second attempt at:

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/x11/gnome-desktop3 Second attempt at:
From: prlw1 <prlw1%pkgsrc.org@localhost>
Date: Thu, 14 Oct 2021 16:29:52 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/593c680a3269
branches:  trunk
changeset: 639657:593c680a3269
user:      prlw1 <prlw1%pkgsrc.org@localhost>
date:      Sun Sep 21 04:43:51 2014 +0000

description:
Second attempt at:

Fix build on systems which don't provide openat() such as NetBSD 6
https://bugzilla.gnome.org/show_bug.cgi?id=735974

after Joerg's failure report. Previous was tested on NetBSD 6 and 7. Not
so this time.

diffstat:

 x11/gnome-desktop3/Makefile                                   |   10 +-
 x11/gnome-desktop3/distinfo                                   |    8 +-
 x11/gnome-desktop3/patches/patch-aa                           |    6 +-
 x11/gnome-desktop3/patches/patch-configure                    |  566 ++++++++++
 x11/gnome-desktop3/patches/patch-configure.ac                 |   17 -
 x11/gnome-desktop3/patches/patch-libgnome-desktop_Makefile.am |   59 -
 x11/gnome-desktop3/patches/patch-libgnome-desktop_Makefile.in |  274 ++++
 7 files changed, 848 insertions(+), 92 deletions(-)

diffs (truncated from 998 to 300 lines):

diff -r add59eb9be81 -r 593c680a3269 x11/gnome-desktop3/Makefile
--- a/x11/gnome-desktop3/Makefile       Sun Sep 21 00:09:24 2014 +0000
+++ b/x11/gnome-desktop3/Makefile       Sun Sep 21 04:43:51 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2014/09/11 14:00:18 prlw1 Exp $
+# $NetBSD: Makefile,v 1.19 2014/09/21 04:43:51 prlw1 Exp $
 
 DISTNAME=      gnome-desktop-3.10.2
 PKGNAME=       ${DISTNAME:S/desktop/desktop3/}
@@ -17,14 +17,6 @@
 USE_TOOLS+=    gmake intltool msgfmt pkg-config
 USE_PKGLOCALEDIR=      yes
 
-# For https://bugzilla.gnome.org/show_bug.cgi?id=735974
-# to fix build on systems which lack openat()
-USE_TOOLS+=    autoconf automake
-
-pre-configure:
-       cd ${WRKSRC} && autoreconf -i
-#
-
 PKGCONFIG_OVERRIDE+=   libgnome-desktop/gnome-desktop-3.0.pc.in
 
 CONFIGURE_ARGS+=       --with-gnome-distributor="The NetBSD Foundation"
diff -r add59eb9be81 -r 593c680a3269 x11/gnome-desktop3/distinfo
--- a/x11/gnome-desktop3/distinfo       Sun Sep 21 00:09:24 2014 +0000
+++ b/x11/gnome-desktop3/distinfo       Sun Sep 21 04:43:51 2014 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.7 2014/09/11 14:00:18 prlw1 Exp $
+$NetBSD: distinfo,v 1.8 2014/09/21 04:43:51 prlw1 Exp $
 
 SHA1 (gnome-desktop-3.10.2.tar.xz) = fd13640ad7f096f29267366bcdf4cf8dc95af07a
 RMD160 (gnome-desktop-3.10.2.tar.xz) = 9d59c58c497eafa75a5ae7a38edaa740c8c77726
 Size (gnome-desktop-3.10.2.tar.xz) = 1062876 bytes
-SHA1 (patch-aa) = 7172c842aff2999e546ad9ee2f42786bba1fcd53
-SHA1 (patch-configure.ac) = 54c79facb6f4953034866e23da9514c09e6ba06c
-SHA1 (patch-libgnome-desktop_Makefile.am) = a9c2584b041e4ff01a073b779a3a92551368316a
+SHA1 (patch-aa) = 26bd3513ac6757ab1a406a8c40be37aa25c98ad4
+SHA1 (patch-configure) = febb8117f7d3b658d813679f0a95d46661e02147
+SHA1 (patch-libgnome-desktop_Makefile.in) = c8ff8fe775102aed193652f5569779a561bc3897
diff -r add59eb9be81 -r 593c680a3269 x11/gnome-desktop3/patches/patch-aa
--- a/x11/gnome-desktop3/patches/patch-aa       Sun Sep 21 00:09:24 2014 +0000
+++ b/x11/gnome-desktop3/patches/patch-aa       Sun Sep 21 04:43:51 2014 +0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.3 2014/09/11 14:00:18 prlw1 Exp $
+$NetBSD: patch-aa,v 1.4 2014/09/21 04:43:51 prlw1 Exp $
 
 Fix build on systems which don't provide openat()
 https://bugzilla.gnome.org/show_bug.cgi?id=735974
 
 allow 64-bit time_t on 32-bit system
 
---- libgnome-desktop/gnome-desktop-thumbnail.c.orig    2012-08-23 17:49:46.000000000 +0000
+--- libgnome-desktop/gnome-desktop-thumbnail.c.orig    2013-11-21 11:14:44.000000000 +0000
 +++ libgnome-desktop/gnome-desktop-thumbnail.c
 @@ -43,7 +43,9 @@
  #define GNOME_DESKTOP_USE_UNSTABLE_API
@@ -35,7 +35,7 @@
              return NULL;
          }
      }
-@@ -1613,7 +1613,7 @@ gnome_desktop_thumbnail_is_valid (GdkPix
+@@ -1666,7 +1670,7 @@ gnome_desktop_thumbnail_is_valid (GdkPix
    thumb_mtime_str = gdk_pixbuf_get_option (pixbuf, "tEXt::Thumb::MTime");
    if (!thumb_mtime_str)
      return FALSE;
diff -r add59eb9be81 -r 593c680a3269 x11/gnome-desktop3/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gnome-desktop3/patches/patch-configure        Sun Sep 21 04:43:51 2014 +0000
@@ -0,0 +1,566 @@
+$NetBSD: patch-configure,v 1.1 2014/09/21 04:43:51 prlw1 Exp $
+
+Fix build on systems which don't provide openat()
+https://bugzilla.gnome.org/show_bug.cgi?id=735974
+
+--- configure.orig     2014-09-21 04:28:34.000000000 +0000
++++ configure
+@@ -676,10 +676,6 @@ CATOBJEXT
+ CATALOGS
+ MSGFMT_OPTS
+ GETTEXT_PACKAGE
+-YELP_HELP_RULES
+-XMLLINT
+-ITSTOOL
+-HELP_DIR
+ ISO_CODES_PREFIX
+ XKB_BASE
+ GNOME_DESKTOP_LIBS
+@@ -692,6 +688,8 @@ X_CFLAGS
+ XMKMF
+ XLIB_LIBS
+ XLIB_CFLAGS
++USE_LIBGSYSTEM_FALSE
++USE_LIBGSYSTEM_TRUE
+ LIBM
+ XEXT_REQUIRED
+ XRANDR_REQUIRED
+@@ -891,7 +889,6 @@ enable_deprecation_flags
+ enable_desktop_docs
+ with_pnp_ids_path
+ with_x
+-with_help_dir
+ enable_introspection
+ with_html_dir
+ enable_gtk_doc
+@@ -915,8 +912,6 @@ XLIB_LIBS
+ XMKMF
+ GNOME_DESKTOP_CFLAGS
+ GNOME_DESKTOP_LIBS
+-ITSTOOL
+-XMLLINT
+ GTKDOC_DEPS_CFLAGS
+ GTKDOC_DEPS_LIBS'
+ 
+@@ -1581,7 +1576,6 @@ Optional Packages:
+  --with-gnome-distributor=DISTRIBUTOR Specify name of GNOME distributor
+   --with-pnp-ids-path     Specify the path to pnp.ids [default=(internal)]
+   --with-x                use the X Window System
+-  --with-help-dir=DIR     path where help files are installed
+   --with-html-dir=PATH    path to installed docs
+ 
+ Some influential environment variables:
+@@ -1605,8 +1599,6 @@ Some influential environment variables:
+               C compiler flags for GNOME_DESKTOP, overriding pkg-config
+   GNOME_DESKTOP_LIBS
+               linker flags for GNOME_DESKTOP, overriding pkg-config
+-  ITSTOOL     Path to the `itstool` command
+-  XMLLINT     Path to the `xmllint` command
+   GTKDOC_DEPS_CFLAGS
+               C compiler flags for GTKDOC_DEPS, overriding pkg-config
+   GTKDOC_DEPS_LIBS
+@@ -2397,7 +2389,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ 
+-am__api_version='1.13'
++am__api_version='1.14'
+ 
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+@@ -3079,6 +3071,47 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; }
+ 
+ 
+ 
++# POSIX will say in a future version that running "rm -f" with no argument
++# is OK; and we want to be able to make that assumption in our Makefile
++# recipes.  So use an aggressive probe to check that the usage we want is
++# actually supported "in the wild" to an acceptable degree.
++# See automake bug#10828.
++# To make any issue more visible, cause the running configure to be aborted
++# by default if the 'rm' program in use doesn't match our expectations; the
++# user can still override this though.
++if rm -f && rm -fr && rm -rf; then : OK; else
++  cat >&2 <<'END'
++Oops!
++
++Your 'rm' program seems unable to run without file operands specified
++on the command line, even when the '-f' option is present.  This is contrary
++to the behaviour of most rm programs out there, and not conforming with
++the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
++
++Please tell bug-automake%gnu.org@localhost about your system, including the value
++of your $PATH and any error possibly output before this message.  This
++can help us improve future automake versions.
++
++END
++  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
++    echo 'Configuration will proceed anyway, since you have set the' >&2
++    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
++    echo >&2
++  else
++    cat >&2 <<'END'
++Aborting the configuration process, to ensure you take notice of the issue.
++
++You can download and install GNU coreutils to get an 'rm' implementation
++that behaves properly: <http://www.gnu.org/software/coreutils/>.
++
++If you want to complete the configuration process using your problematic
++'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
++to "yes", and re-run configure.
++
++END
++    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
++  fi
++fi
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+@@ -4176,6 +4209,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
++$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
++if ${am_cv_prog_cc_c_o+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++  # Make sure it works both with $CC and with simple cc.
++  # Following AC_PROG_CC_C_O, we do the test twice because some
++  # compilers refuse to overwrite an existing .o file with -o,
++  # though they will create one.
++  am_cv_prog_cc_c_o=yes
++  for am_i in 1 2; do
++    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
++   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
++   ac_status=$?
++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
++   (exit $ac_status); } \
++         && test -f conftest2.$ac_objext; then
++      : OK
++    else
++      am_cv_prog_cc_c_o=no
++      break
++    fi
++  done
++  rm -f core conftest*
++  unset am_i
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
++$as_echo "$am_cv_prog_cc_c_o" >&6; }
++if test "$am_cv_prog_cc_c_o" != yes; then
++   # Losing compiler, so override with the script.
++   # FIXME: It is wrong to rewrite CC.
++   # But if we don't then we get into trouble of one sort or another.
++   # A longer-term fix would be to have automake use am__CC in this case,
++   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
++   CC="$am_aux_dir/compile $CC"
++fi
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++
+ depcc="$CC"   am_compiler_list=
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+@@ -13141,6 +13233,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
++$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
++if ${am_cv_prog_cc_c_o+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++  # Make sure it works both with $CC and with simple cc.
++  # Following AC_PROG_CC_C_O, we do the test twice because some
++  # compilers refuse to overwrite an existing .o file with -o,
++  # though they will create one.
++  am_cv_prog_cc_c_o=yes
++  for am_i in 1 2; do
++    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
++   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
++   ac_status=$?
++   echo "$as_me:$LINENO: \$? = $ac_status" >&5
++   (exit $ac_status); } \
++         && test -f conftest2.$ac_objext; then
++      : OK
++    else
++      am_cv_prog_cc_c_o=no
++      break
++    fi
++  done
++  rm -f core conftest*
++  unset am_i
++fi
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/glib2 Fixes glib2 on netbsd-5. From OBATA Akio. ...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc Updated devel/gmtk to 1.0.9
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/glib2 Fixes glib2 on netbsd-5. From OBATA Akio. ...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated devel/gmtk to 1.0.9
Indexes:
Home | Main Index | Thread Index | Old Index