[arch-commits] Commit in avahi/trunk (2 files)

[Jan Steffens]

    Date: Wednesday, July 18, 2018 @ 08:19:09
  Author: heftig
Revision: 328959

patch is bad

Modified:
  avahi/trunk/PKGBUILD
Deleted:
  avahi/trunk/0001-build-Attempt-GDBM-1.15-compatibility.patch

--------------------------------------------------+
 0001-build-Attempt-GDBM-1.15-compatibility.patch |   94 ---------------------
 PKGBUILD                                         |   14 ---
 2 files changed, 2 insertions(+), 106 deletions(-)

Deleted: 0001-build-Attempt-GDBM-1.15-compatibility.patch
===================================================================
--- 0001-build-Attempt-GDBM-1.15-compatibility.patch	2018-07-18 07:01:52 UTC (rev 328958)
+++ 0001-build-Attempt-GDBM-1.15-compatibility.patch	2018-07-18 08:19:09 UTC (rev 328959)
@@ -1,94 +0,0 @@
-From f2626c5f6c2c3737daab90503fd18ca7208791ec Mon Sep 17 00:00:00 2001
-Message-Id: <f2626c5f6c2c3737daab90503fd18ca7208791ec.1529708748.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sat, 23 Jun 2018 01:05:20 +0200
-Subject: [PATCH] build: Attempt GDBM 1.15 compatibility
-
----
- configure.ac                      |  3 +++
- service-type-database/Makefile.am | 34 +++++++++++++++----------------
- 2 files changed, 20 insertions(+), 17 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 72d6147..ee25ba1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -772,18 +772,21 @@ if test "x$HAVE_GDBM" = "xyes" ; then
-         AC_MSG_ERROR([*** libgdbm not found ***])
-     fi
-     AC_DEFINE([HAVE_GDBM],[],[Support for GDBM])
-+
-+    AC_CHECK_MEMBER([gdbm_recovery.duplicate_keys], [have_gdbm_1_15=yes], [], [[#include <gdbm.h>]])
- else
-     if test "x$HAVE_DBM" = "xyes" ; then
-         AC_CHECK_HEADERS(ndbm.h, have_dbm=true, have_dbm=false)
- 
-         if ! $have_dbm ; then
-             AC_MSG_ERROR([*** dbm not found ***])
-         fi
-         AC_DEFINE([HAVE_DBM],[],[Support for DBM])
-     fi
- fi
- AM_CONDITIONAL(HAVE_GDBM, test "x$HAVE_GDBM" = "xyes")
- AM_CONDITIONAL(HAVE_DBM, test "x$HAVE_DBM" = "xyes")
-+AM_CONDITIONAL(HAVE_DBM_SPLIT, [test "x$have_gdbm_1_15" = "xyes" || test "x$HAVE_DBM" = "xyes"])
- 
- #
- # libdaemon
-diff --git a/service-type-database/Makefile.am b/service-type-database/Makefile.am
-index f9fa082..0fe4af1 100644
---- a/service-type-database/Makefile.am
-+++ b/service-type-database/Makefile.am
-@@ -22,32 +22,32 @@ pkglibdatadir=$(libdir)/avahi
- pkglibdata_DATA=
- 
- if HAVE_PYTHON
--if HAVE_GDBM
- 
- noinst_SCRIPTS=build-db
-+
-+if HAVE_DBM_SPLIT
-+
-+pkglibdata_DATA+=service-types.db.pag service-types.db.dir
-+
-+service-types.db.pag: service-types.db
-+	$(AM_V_GEN)mv service-types.db.coming.pag service-types.db.pag
-+service-types.db.dir: service-types.db
-+	$(AM_V_GEN)mv service-types.db.coming.dir service-types.db.dir
-+service-types.db: service-types
-+	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
-+	if test -f "$@.coming"; then mv $@.coming $@; fi
-+
-+CLEANFILES = service-types.db*
-+
-+else
-+
- pkglibdata_DATA+=service-types.db
- 
- service-types.db: service-types
- 	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
- 	mv $@.coming $@
- 
- CLEANFILES = service-types.db
- 
--endif
--if HAVE_DBM
--
--noinst_SCRIPTS=build-db
--pkglibdata_DATA+=service-types.db.pag service-types.db.dir
--
--service-types.db.pag: service-types.db
--	$(AM_V_GEN)mv service-types.db.coming.pag service-types.db.pag
--service-types.db.dir: service-types.db
--	$(AM_V_GEN)mv service-types.db.coming.dir service-types.db.dir
--service-types.db: service-types build-db
--	$(AM_V_GEN)$(PYTHON) build-db $< $@.coming && \
--	if test -f "$@.coming"; then mv $@.coming $@; fi
--
--CLEANFILES = service-types.db*
--
- endif
- endif
--- 
-2.18.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-18 07:01:52 UTC (rev 328958)
+++ PKGBUILD	2018-07-18 08:19:09 UTC (rev 328959)
@@ -26,10 +26,8 @@
 backup=(etc/avahi/{hosts,avahi-daemon.conf,avahi-{autoip,dnsconf}d.action}
         usr/lib/avahi/service-types.db)
 _commit=1cc2b8e8d62e939b8bd683f795794878863931af  # master
-source=("git+https://github.com/lathiat/avahi#commit=$_commit"
-        0001-build-Attempt-GDBM-1.15-compatibility.patch)
-sha512sums=('SKIP'
-            '1547211c7253999fd07a0a16bb17c85c2a111caf4763390d6e54b39ee1b2530f022d29d42bb0ed750a5c5b630c86bffbc0d4429c64bf2b59097a00e36cf98cb2')
+source=("git+https://github.com/lathiat/avahi#commit=$_commit")
+sha512sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -38,14 +36,6 @@
 
 prepare() {
   cd $pkgname
-  # This patch seems to cause the build to fail:
-  #     GEN      service-types.db
-  #     GEN      service-types.db.pag
-  #     GEN      service-types.db.dir
-  #   mv: cannot stat 'service-types.db.coming.pag': No such file or directory
-  #   mv: cannot stat 'service-types.db.coming.dir': No such file or directory
-  #   make[2]: *** [Makefile:668: service-types.db.pag] Error 1
-  #patch -Np1 -i ../0001-build-Attempt-GDBM-1.15-compatibility.patch
   NOCONFIGURE=1 ./autogen.sh
 }