Date: Thursday, June 3, 2021 @ 19:49:31 Author: dvzrv Revision: 955724
upgpkg: gigedit 1.2.0-1: Upgrade to 1.2.0. Add patch to not install libgigedit.so namespaced, so that no ld.so.conf is needed. Add patch to not extend the pango namespace, as it breaks the build (the extension is not even used). Added: gigedit/trunk/gigedit-1.2.0-libdir.patch gigedit/trunk/gigedit-1.2.0-redeclare.patch Modified: gigedit/trunk/PKGBUILD -------------------------------+ PKGBUILD | 39 ++++++++++----- gigedit-1.2.0-libdir.patch | 98 ++++++++++++++++++++++++++++++++++++++++ gigedit-1.2.0-redeclare.patch | 15 ++++++ 3 files changed, 139 insertions(+), 13 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-06-03 19:41:48 UTC (rev 955723) +++ PKGBUILD 2021-06-03 19:49:31 UTC (rev 955724) @@ -1,26 +1,42 @@ -# Maintainer: David Runge <[email protected]> +# Maintainer: David Runge <[email protected]> # Contributor: Ray Rashif <[email protected]> # Contributor: svoufff <svoufff at gmail dot com> # Contributor: Shinlun Hsieh <[email protected]> pkgname=gigedit -pkgver=1.1.1 -pkgrel=2 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Gigasampler instrument editor" arch=('x86_64') url="https://www.linuxsampler.org/"; license=('GPL2') groups=('pro-audio') -depends=('linuxsampler' 'gtkmm3') -makedepends=('gendesk' 'intltool' 'libxslt' 'linuxsampler') -source=("https://download.linuxsampler.org/packages/${pkgname}-${pkgver}.tar.bz2";) -sha512sums=('223702628e83e12a292f902e32baa355aca31ee82f1f8b9fed586ec9c0aaec56956d7bdc958238ec64e79b2f4c5ef9246face669b2b3645046e51d8c8289a964') +depends=('atk' 'libatk-1.0.so' 'atkmm' 'libatkmm-1.6.so' 'cairo' 'cairomm' +'libcairomm-1.0.so' 'gcc-libs' 'gdk-pixbuf2' 'libgdk_pixbuf-2.0.so' 'glib2' +'libgio-2.0.so' 'libgobject-2.0.so' 'libglib-2.0.so' 'glibc' 'glibmm' +'libglibmm-2.4.so' 'gtk3' 'libgdk-3.so' 'libgtk-3.so' 'gtkmm3' +'libgtkmm-3.0.so' 'harfbuzz' 'libharfbuzz.so' 'libgig' 'libgig.so' 'libsigc++' +'libsigc-2.0.so' 'libsndfile' 'libsndfile.so' 'linuxsampler' +'liblinuxsampler.so' 'pango' 'libpango-1.0.so' 'libpangocairo-1.0.so' 'pangomm' +'libpangomm-1.4.so' 'zlib') +makedepends=('gendesk' 'intltool' 'libxslt') +provides=('libgigedit.so') +source=("https://download.linuxsampler.org/packages/${pkgname}-${pkgver}.tar.bz2"; + "${pkgname}-1.2.0-libdir.patch" + "${pkgname}-1.2.0-redeclare.patch") +sha512sums=('b991a5193af34be70db6eb8c18fc58e01b822b6997bfc6c3ee06eca42f57375d341316e8abc594824668c7cb916b0643a1ee1b5c34426bf3ec5e202dfc565c8f' + 'd701ee5fb013c08f3f9bb9a85464c82aaa1200ca14f8876dfd5d4835f41c1325728c07279528fb22737d79e41b33f931628637c62458e5f49aaa77f6b5dd5fe9' + '289ad93f820da7cbd48387ea68945285297abbef33794dc2b24cc256c6384ce7ff1a1d9462cf7d37e1cffc5ddaadf52f421d904baea6d6f5db3acfe29aff445e') +b2sums=('049e4c60b345c192255669a71588df1e2905590f95351d8a79134b210d03087ac9cc33f12cbf2e38208b95ad452f299c78877632989cd914d98a05c5967087d5' + 'c752d259e42c47bfd4e819daee271a565dbd30aa5806151be028eb333ec22f40b862529fb40c69fc14f5cd455efc52d43c959501512dd72ad71b48527e7fee3c' + '7f3f89fdccab17ac73da63467d039ea608b4e0df2f598a9ca08f7560802207399b184f98f59cfa5881f26c000ce69797236b76659b85dd5cd49766324cf70638') prepare() { cd "${pkgname}-${pkgver}" - autoreconf -vfi - # creating a ld.so.conf entry for gigedit.so - echo "/usr/lib/${pkgname}" > "${pkgname}.conf" + # install shared object to global namespace, so no ld.so.conf is required + patch -Np1 -i ../"${pkgname}-1.2.0-libdir.patch" + # do not extend the pango namespace (breaks the build) + patch -Np1 -i ../"${pkgname}-1.2.0-redeclare.patch" # generate XDG desktop file gendesk -n \ --pkgname "${pkgname}" \ @@ -43,9 +59,6 @@ # docs install -t "${pkgdir}/usr/share/doc/${pkgname}" \ -vDm 644 {AUTHORS,ChangeLog,NEWS,README} - # adding gigedit.so library path to ld.so.conf (required for dependants during - # runtime) - install -vDm 644 "${pkgname}.conf" -t "${pkgdir}/etc/ld.so.conf.d/" } # vim:set ts=2 sw=2 et: Added: gigedit-1.2.0-libdir.patch =================================================================== --- gigedit-1.2.0-libdir.patch (rev 0) +++ gigedit-1.2.0-libdir.patch 2021-06-03 19:49:31 UTC (rev 955724) @@ -0,0 +1,98 @@ +diff -ruN a/Makefile.in b/Makefile.in +--- a/Makefile.in 2021-05-09 14:39:59.000000000 +0200 ++++ b/Makefile.in 2021-06-03 21:10:29.658438256 +0200 +@@ -71,8 +71,8 @@ + am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkglibdir = $(libdir)/ ++pkglibexecdir = $(libexecdir)/ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +diff -ruN a/doc/Makefile.in b/doc/Makefile.in +--- a/doc/Makefile.in 2021-05-09 14:39:59.000000000 +0200 ++++ b/doc/Makefile.in 2021-06-03 21:02:44.757057009 +0200 +@@ -71,8 +71,8 @@ + am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkglibdir = $(libdir)/ ++pkglibexecdir = $(libexecdir)/ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +diff -ruN a/doc/quickstart/Makefile.in b/doc/quickstart/Makefile.in +--- a/doc/quickstart/Makefile.in 2021-05-09 14:39:59.000000000 +0200 ++++ b/doc/quickstart/Makefile.in 2021-06-03 21:10:42.911811038 +0200 +@@ -72,8 +72,8 @@ + am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkglibdir = $(libdir)/ ++pkglibexecdir = $(libexecdir)/ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +diff -ruN a/gfx/Makefile.in b/gfx/Makefile.in +--- a/gfx/Makefile.in 2021-05-09 14:39:59.000000000 +0200 ++++ b/gfx/Makefile.in 2021-06-03 21:10:53.145174831 +0200 +@@ -72,8 +72,8 @@ + am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkglibdir = $(libdir)/ ++pkglibexecdir = $(libexecdir)/ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +diff -ruN a/src/Makefile.in b/src/Makefile.in +--- a/src/Makefile.in 2021-05-09 14:39:59.000000000 +0200 ++++ b/src/Makefile.in 2021-06-03 21:11:06.048546576 +0200 +@@ -71,8 +71,8 @@ + am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkglibdir = $(libdir)/ ++pkglibexecdir = $(libexecdir)/ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +diff -ruN a/src/gigedit/Makefile.in b/src/gigedit/Makefile.in +--- a/src/gigedit/Makefile.in 2021-05-09 14:40:00.000000000 +0200 ++++ b/src/gigedit/Makefile.in 2021-06-03 21:11:19.035251903 +0200 +@@ -73,8 +73,8 @@ + am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkglibdir = $(libdir)/ ++pkglibexecdir = $(libexecdir)/ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c +diff -ruN a/src/gigedit/gfx/Makefile.in b/src/gigedit/gfx/Makefile.in +--- a/src/gigedit/gfx/Makefile.in 2021-05-09 14:40:00.000000000 +0200 ++++ b/src/gigedit/gfx/Makefile.in 2021-06-03 21:11:38.128642081 +0200 +@@ -72,8 +72,8 @@ + am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) + pkgdatadir = $(datadir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ +-pkglibdir = $(libdir)/@PACKAGE@ +-pkglibexecdir = $(libexecdir)/@PACKAGE@ ++pkglibdir = $(libdir)/ ++pkglibexecdir = $(libexecdir)/ + am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd + install_sh_DATA = $(install_sh) -c -m 644 + install_sh_PROGRAM = $(install_sh) -c Added: gigedit-1.2.0-redeclare.patch =================================================================== --- gigedit-1.2.0-redeclare.patch (rev 0) +++ gigedit-1.2.0-redeclare.patch 2021-06-03 19:49:31 UTC (rev 955724) @@ -0,0 +1,15 @@ +diff -ruN a/src/gigedit/compat.h b/src/gigedit/compat.h +--- a/src/gigedit/compat.h 2021-02-21 15:41:48.000000000 +0100 ++++ b/src/gigedit/compat.h 2021-06-03 19:28:13.603235786 +0200 +@@ -190,11 +190,6 @@ + + #if HAS_PANGOMM_CPP11_ENUMS + # include <pangomm/layout.h> +-namespace Pango { +- const Alignment ALIGN_LEFT = Alignment::LEFT; +- const Alignment ALIGN_CENTER = Alignment::CENTER; +- const Alignment ALIGN_RIGHT = Alignment::RIGHT; +-} + #endif // HAS_PANGOMM_CPP11_ENUMS + + #if HAS_GTKMM_CPP11_ENUMS
