[arch-commits] Commit in libcdio/trunk (PKGBUILD libcdio-0.83-linking.patch)

[Jan Steffens]

    Date: Monday, December 11, 2017 @ 19:02:59
  Author: heftig
Revision: 312182

1.1.0-1

Modified:
  libcdio/trunk/PKGBUILD
Deleted:
  libcdio/trunk/libcdio-0.83-linking.patch

----------------------------+
 PKGBUILD                   |   23 ++++++++++-------------
 libcdio-0.83-linking.patch |   22 ----------------------
 2 files changed, 10 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-11 17:54:46 UTC (rev 312181)
+++ PKGBUILD	2017-12-11 19:02:59 UTC (rev 312182)
@@ -3,28 +3,20 @@
 # Contributor: damir <damir at archlinux.org>
 
 pkgname=libcdio
-pkgver=0.94
-pkgrel=2
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="GNU Compact Disc Input and Control Library"
 arch=('x86_64')
 license=('GPL3')
 url="https://www.gnu.org/software/libcdio/"
 depends=('libcddb' 'ncurses' 'gcc-libs')
-source=(https://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig}
-        libcdio-0.83-linking.patch)
-sha256sums=('96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a'
-            'SKIP'
-            'd88186b2a11726fe5ef10853e0245996b55793552b14230d1f7ba5ee3c54f3ed')
+source=(https://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.gz{,.sig})
+sha256sums=('785c32494e4770c38bef09b1a545ef3acec8ccfbf2b799cb7e70dc380cbcf164'
+            'SKIP')
 validpgpkeys=('DAA63BC2582034A02B923D521A8DE5008275EC21') # R. Bernstein
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  patch -Np1 -i ../libcdio-0.83-linking.patch
-
-  # Unbreak symbol versioning
-  # https://savannah.gnu.org/bugs/?49907
-  sed -i '/AM_INIT_AUTOMAKE/s/subdir-objects//' configure.ac
-
   autoreconf -fi
 }
 
@@ -35,6 +27,11 @@
   make
 }
 
+check() {
+  cd ${pkgname}-${pkgver}
+  make -C test check
+}
+
 package() {
   cd ${pkgname}-${pkgver}
   make -j1 DESTDIR="${pkgdir}" install

Deleted: libcdio-0.83-linking.patch
===================================================================
--- libcdio-0.83-linking.patch	2017-12-11 17:54:46 UTC (rev 312181)
+++ libcdio-0.83-linking.patch	2017-12-11 19:02:59 UTC (rev 312182)
@@ -1,22 +0,0 @@
-diff -Naur libcdio-0.83-orig/example/C++/OO/Makefile.in libcdio-0.83/example/C++/OO/Makefile.in
---- libcdio-0.83-orig/example/C++/OO/Makefile.in	2011-10-27 18:02:31.000000000 +1000
-+++ libcdio-0.83/example/C++/OO/Makefile.in	2012-02-18 11:10:07.369277231 +1000
-@@ -315,15 +315,15 @@
- 
- isofile2_SOURCES = isofile2.cpp
- isofile2_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
--	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
-+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
- 
- isolist_SOURCES = isolist.cpp
- isolist_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
--	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
-+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
- 
- iso4_SOURCES = iso4.cpp
- iso4_LDADD = $(LIBISO9660PP_LIBS) $(LIBISO9660_LIBS) \
--	              $(LIBCDIOPP_LIBS) $(LTLIBICONV)
-+	              $(LIBCDIOPP_LIBS) $(LIBCDIO_LIBS) $(LTLIBICONV)
- 
- mmc1_SOURCES = mmc1.cpp
- mmc1_DEPENDENCIES = $(LIBCDIO_DEPS)