[arch-commits] Commit in gpick/repos/community-x86_64 (6 files)
Robin Broda
coderobe at archlinux.org
Thu May 27 21:33:51 UTC 2021
Date: Thursday, May 27, 2021 @ 21:33:50
Author: coderobe
Revision: 949176
archrelease: copy trunk to community-x86_64
Added:
gpick/repos/community-x86_64/PKGBUILD
(from rev 949175, gpick/trunk/PKGBUILD)
gpick/repos/community-x86_64/gpick-link-expat.patch
(from rev 949175, gpick/trunk/gpick-link-expat.patch)
gpick/repos/community-x86_64/scons-python3.patch
(from rev 949175, gpick/trunk/scons-python3.patch)
Deleted:
gpick/repos/community-x86_64/PKGBUILD
gpick/repos/community-x86_64/gpick-link-expat.patch
gpick/repos/community-x86_64/scons-python3.patch
------------------------+
PKGBUILD | 76 +++++++++-------
gpick-link-expat.patch | 74 ++++++++--------
scons-python3.patch | 212 +++++++++++++++++++++++------------------------
3 files changed, 185 insertions(+), 177 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-05-27 21:33:38 UTC (rev 949175)
+++ PKGBUILD 2021-05-27 21:33:50 UTC (rev 949176)
@@ -1,34 +0,0 @@
-# Maintainer: Alad Wenter <alad at mailbox.org>
-# Contributor: Martin Wimpress <code at flexion.org>
-
-pkgname=gpick
-pkgver=0.2.6rc1
-pkgrel=10
-pkgdesc="Advanced color picker written in C++ using GTK+ toolkit"
-arch=('x86_64')
-url="http://www.gpick.org/"
-license=('BSD')
-depends=('boost-libs' 'gtk2' 'lua')
-makedepends=('boost' 'scons' 'ragel')
-source=("https://github.com/thezbyg/$pkgname/archive/$pkgname-$pkgver.tar.gz" scons-python3.patch
- gpick-link-expat.patch)
-sha256sums=('4e55600a6894fb52ab3d9d4a2fc42580cce289da6912bf916060a5a6301333d8'
- '1a5f4f7c8846ba3af0247495391ffa09f0425a39a1911cd88dffcbdf1487082c'
- '6091496e3b300c4edc986e9c0938539ffa2e62067f3e578286ca34bbbd5dc712')
-
-prepare() {
- cd $pkgname-$pkgname-$pkgver
- patch -p1 -i ../scons-python3.patch
- patch -p1 -i ../gpick-link-expat.patch # https://github.com/thezbyg/gpick/issues/112
-}
-
-build() {
- cd "$pkgname-$pkgname-$pkgver"
- scons
-}
-
-package() {
- cd "$pkgname-$pkgname-$pkgver"
- scons DESTDIR="$pkgdir/usr" install
- install -Dm644 installer/License.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
Copied: gpick/repos/community-x86_64/PKGBUILD (from rev 949175, gpick/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-05-27 21:33:50 UTC (rev 949176)
@@ -0,0 +1,42 @@
+# Maintainer: Robin Broda <coderobe at archlinux.org>
+# Contributor: Alad Wenter <alad at mailbox.org>
+# Contributor: Martin Wimpress <code at flexion.org>
+
+pkgname=gpick
+pkgver=0.2.6
+pkgrel=1
+pkgdesc="Advanced color picker written in C++ using GTK+ toolkit"
+arch=('x86_64')
+url="http://www.gpick.org/"
+license=('BSD')
+depends=('boost-libs' 'gtk2' 'lua')
+makedepends=('boost' 'scons' 'ragel')
+source=("https://github.com/thezbyg/$pkgname/archive/$pkgname-$pkgver.tar.gz"
+ "https://github.com/thezbyg/$pkgname/commit/d4b7e77e895f57bf5dfee3cf4f0ad0258ec303bf.patch"
+ "https://github.com/thezbyg/$pkgname/commit/0f11efed811b8d986046984c1e7099d6a49c2650.patch"
+ "https://github.com/thezbyg/$pkgname/commit/37b14bbb149dfd0944c20b9da6ea472eb2f669cd.patch"
+ "https://github.com/thezbyg/$pkgname/commit/decbb45ac3bda3f7a29d5a4a3471ccf52fedc707.patch")
+sha256sums=('7d02be171cc88c44ad3e3572c0922bbabedc9d542b989f324fca9d5db3161e9c'
+ '34ff9ef1ae6f2d9370c630baa07e9c2cbc2345f0aa865647eb53bbb5336b2578'
+ '16968ffdc5b21d2ec189e3c3b2bd0796b9d11cb6de69c716cec18ef16f850c93'
+ '341999b461f8e4c20b1f7111423403099d9dae45ce3ce0080590c7d0a6da05f7'
+ 'fab1c6eb40f250274ad9576d073126e1fbddd78761e5cb15290732e7dca44044')
+
+prepare() {
+ cd "$pkgname-$pkgname-$pkgver"
+ patch -p1 <../d4b7e77e895f57bf5dfee3cf4f0ad0258ec303bf.patch
+ patch -p1 <../0f11efed811b8d986046984c1e7099d6a49c2650.patch
+ patch -p1 <../37b14bbb149dfd0944c20b9da6ea472eb2f669cd.patch
+ patch -p1 <../decbb45ac3bda3f7a29d5a4a3471ccf52fedc707.patch
+}
+
+build() {
+ cd "$pkgname-$pkgname-$pkgver"
+ scons
+}
+
+package() {
+ cd "$pkgname-$pkgname-$pkgver"
+ scons DESTDIR="$pkgdir/usr" install
+ install -Dm644 installer/License.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
Deleted: gpick-link-expat.patch
===================================================================
--- gpick-link-expat.patch 2021-05-27 21:33:38 UTC (rev 949175)
+++ gpick-link-expat.patch 2021-05-27 21:33:50 UTC (rev 949176)
@@ -1,37 +0,0 @@
-From a7e0689c26d2ef7088220ef7d660748271c9274e Mon Sep 17 00:00:00 2001
-From: Ryan Schmidt <git at ryandesign.com>
-Date: Mon, 8 Oct 2018 19:29:44 -0500
-Subject: [PATCH] Always link with libexpat
-
-Always link with libexpat, not just on Linux, GNU Hurd and GNU kFreeBSD.
-Fixes build failure on macOS and presumably other non-GNU UNIX systems.
-
-Closes https://github.com/thezbyg/gpick/issues/112
-
-Still only link with librt on Linux, GNU Hurd and GNU kFreeBSD because that
-library is specific to the GNU C library.
----
- source/SConscript | 10 ++++------
- 1 file changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/source/SConscript b/source/SConscript
-index a666edc..82ecf83 100644
---- a/source/SConscript
-+++ b/source/SConscript
-@@ -47,12 +47,10 @@ if local_env['BUILD_TARGET'] == 'win32':
- else:
- local_env.Append(LINKFLAGS = ['/SUBSYSTEM:WINDOWS', '/ENTRY:mainCRTStartup'], CPPDEFINES = ['XML_STATIC'])
- objects.append(SConscript(['winres/SConscript'], exports='env'))
--elif local_env['BUILD_TARGET'] == 'linux2':
-- local_env.Append(LIBS=['rt', 'expat'])
--elif local_env['BUILD_TARGET'].startswith('gnu0'):
-- local_env.Append(LIBS=['rt', 'expat'])
--elif local_env['BUILD_TARGET'].startswith('gnukfreebsd'):
-- local_env.Append(LIBS=['rt', 'expat'])
-+else:
-+ local_env.Append(LIBS=['expat'])
-+ if local_env['BUILD_TARGET'].startswith('linux') or local_env['BUILD_TARGET'].startswith('gnu0') or local_env['BUILD_TARGET'].startswith('gnukfreebsd'):
-+ local_env.Append(LIBS=['rt'])
-
- local_env.Append(CPPPATH=['#source'])
-
Copied: gpick/repos/community-x86_64/gpick-link-expat.patch (from rev 949175, gpick/trunk/gpick-link-expat.patch)
===================================================================
--- gpick-link-expat.patch (rev 0)
+++ gpick-link-expat.patch 2021-05-27 21:33:50 UTC (rev 949176)
@@ -0,0 +1,37 @@
+From a7e0689c26d2ef7088220ef7d660748271c9274e Mon Sep 17 00:00:00 2001
+From: Ryan Schmidt <git at ryandesign.com>
+Date: Mon, 8 Oct 2018 19:29:44 -0500
+Subject: [PATCH] Always link with libexpat
+
+Always link with libexpat, not just on Linux, GNU Hurd and GNU kFreeBSD.
+Fixes build failure on macOS and presumably other non-GNU UNIX systems.
+
+Closes https://github.com/thezbyg/gpick/issues/112
+
+Still only link with librt on Linux, GNU Hurd and GNU kFreeBSD because that
+library is specific to the GNU C library.
+---
+ source/SConscript | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/source/SConscript b/source/SConscript
+index a666edc..82ecf83 100644
+--- a/source/SConscript
++++ b/source/SConscript
+@@ -47,12 +47,10 @@ if local_env['BUILD_TARGET'] == 'win32':
+ else:
+ local_env.Append(LINKFLAGS = ['/SUBSYSTEM:WINDOWS', '/ENTRY:mainCRTStartup'], CPPDEFINES = ['XML_STATIC'])
+ objects.append(SConscript(['winres/SConscript'], exports='env'))
+-elif local_env['BUILD_TARGET'] == 'linux2':
+- local_env.Append(LIBS=['rt', 'expat'])
+-elif local_env['BUILD_TARGET'].startswith('gnu0'):
+- local_env.Append(LIBS=['rt', 'expat'])
+-elif local_env['BUILD_TARGET'].startswith('gnukfreebsd'):
+- local_env.Append(LIBS=['rt', 'expat'])
++else:
++ local_env.Append(LIBS=['expat'])
++ if local_env['BUILD_TARGET'].startswith('linux') or local_env['BUILD_TARGET'].startswith('gnu0') or local_env['BUILD_TARGET'].startswith('gnukfreebsd'):
++ local_env.Append(LIBS=['rt'])
+
+ local_env.Append(CPPPATH=['#source'])
+
Deleted: scons-python3.patch
===================================================================
--- scons-python3.patch 2021-05-27 21:33:38 UTC (rev 949175)
+++ scons-python3.patch 2021-05-27 21:33:50 UTC (rev 949176)
@@ -1,106 +0,0 @@
---- gpick-gpick-0.2.6rc1/tools/gpick.py.orig 2019-07-26 18:58:37.277863800 +0000
-+++ gpick-gpick-0.2.6rc1/tools/gpick.py 2019-07-26 18:58:51.344706165 +0000
-@@ -6,12 +6,12 @@
- import string
- import glob
- import subprocess
--from lemon import *
--from flex import *
--from gettext import *
--from resource_template import *
--from ragel import *
--from template import *
-+from .lemon import *
-+from .flex import *
-+from .gettext import *
-+from .resource_template import *
-+from .ragel import *
-+from .template import *
- from SCons.Script import *
- from SCons.Util import *
- from SCons.Script.SConscript import SConsEnvironment
-@@ -100,9 +100,9 @@
- def ConfirmPrograms(self, conf, programs):
- conf.AddTests({'CheckProgram': CheckProgram})
-
-- for evar, args in programs.iteritems():
-+ for evar, args in programs.items():
- found = False
-- for name, member_name in args['checks'].iteritems():
-+ for name, member_name in args['checks'].items():
- if conf.CheckProgram(self, name, member_name):
- found = True;
- break
-@@ -116,9 +116,9 @@
- def ConfirmLibs(self, conf, libs):
- conf.AddTests({'CheckPKG': CheckPKG})
-
-- for evar, args in libs.iteritems():
-+ for evar, args in libs.items():
- found = False
-- for name, version in args['checks'].iteritems():
-+ for name, version in args['checks'].items():
- if conf.CheckPKG(name + ' ' + version):
- self[evar]=name
- found = True;
-@@ -155,9 +155,9 @@
- self.AddPostAction(i, Chmod(i, perm))
- return dir
-
-- InstallProgram = lambda self, dir, source: GpickEnvironment.InstallPerm(self, dir, source, 0755)
-- InstallData = lambda self, dir, source: GpickEnvironment.InstallPerm(self, dir, source, 0644)
-- InstallDataAutoDir = lambda self, dir, relative_dir, source: GpickEnvironment.InstallPermAutoDir(self, dir, relative_dir, source, 0644)
-+ InstallProgram = lambda self, dir, source: GpickEnvironment.InstallPerm(self, dir, source, '0755')
-+ InstallData = lambda self, dir, source: GpickEnvironment.InstallPerm(self, dir, source, '0644')
-+ InstallDataAutoDir = lambda self, dir, relative_dir, source: GpickEnvironment.InstallPermAutoDir(self, dir, relative_dir, source, '0644')
-
- def GetSourceFiles(self, dir_exclude_pattern, file_exclude_pattern):
- dir_exclude_prog = re.compile(dir_exclude_pattern)
---- gpick-gpick-0.2.6rc1/SConscript.orig 2019-07-26 22:26:26.884324858 +0000
-+++ gpick-gpick-0.2.6rc1/SConscript 2019-07-26 22:27:07.534897504 +0000
-@@ -49,19 +49,19 @@
- env.GetVersionInfo()
-
- try:
-- umask = os.umask(022)
-+ umask = os.umask(0o22)
- except OSError: # ignore on systems that don't support umask
- pass
-
--if os.environ.has_key('CC'):
-+if os.environ.get('CC'):
- env['CC'] = os.environ['CC']
--if os.environ.has_key('CFLAGS'):
-+if os.environ.get('CFLAGS'):
- env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
--if os.environ.has_key('CXX'):
-+if os.environ.get('CXX'):
- env['CXX'] = os.environ['CXX']
--if os.environ.has_key('CXXFLAGS'):
-+if os.environ.get('CXXFLAGS'):
- env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
--if os.environ.has_key('LDFLAGS'):
-+if os.environ.get('LDFLAGS'):
- env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-
- if not env.GetOption('clean'):
-@@ -97,7 +97,7 @@
- Decider('MD5-timestamp')
-
- if not env['TOOLCHAIN'] == 'msvc':
-- if not (os.environ.has_key('CFLAGS') or os.environ.has_key('CXXFLAGS') or os.environ.has_key('LDFLAGS')):
-+ if not (os.environ.get('CFLAGS') or os.environ.get('CXXFLAGS') or os.environ.get('LDFLAGS')):
- if env['DEBUG']:
- env.Append(
- CPPFLAGS = ['-Wall', '-g3', '-O0'],
---- gpick-gpick-0.2.6rc1/source/dbus/SConscript.orig 2019-07-26 22:38:12.841066003 +0000
-+++ gpick-gpick-0.2.6rc1/source/dbus/SConscript 2019-07-26 22:39:19.508817931 +0000
-@@ -9,7 +9,7 @@
- if not local_env.GetOption('clean') and not env['TOOLCHAIN'] == 'msvc':
- if not env['USE_GTK3']:
- local_env.ParseConfig('pkg-config --cflags $GIO_PC')
-- else:
-+ else:
- local_env.ParseConfig('pkg-config --cflags $GTK_PC')
-
- if not env['BUILD_TARGET'] == 'win32':
Copied: gpick/repos/community-x86_64/scons-python3.patch (from rev 949175, gpick/trunk/scons-python3.patch)
===================================================================
--- scons-python3.patch (rev 0)
+++ scons-python3.patch 2021-05-27 21:33:50 UTC (rev 949176)
@@ -0,0 +1,106 @@
+--- gpick-gpick-0.2.6rc1/tools/gpick.py.orig 2019-07-26 18:58:37.277863800 +0000
++++ gpick-gpick-0.2.6rc1/tools/gpick.py 2019-07-26 18:58:51.344706165 +0000
+@@ -6,12 +6,12 @@
+ import string
+ import glob
+ import subprocess
+-from lemon import *
+-from flex import *
+-from gettext import *
+-from resource_template import *
+-from ragel import *
+-from template import *
++from .lemon import *
++from .flex import *
++from .gettext import *
++from .resource_template import *
++from .ragel import *
++from .template import *
+ from SCons.Script import *
+ from SCons.Util import *
+ from SCons.Script.SConscript import SConsEnvironment
+@@ -100,9 +100,9 @@
+ def ConfirmPrograms(self, conf, programs):
+ conf.AddTests({'CheckProgram': CheckProgram})
+
+- for evar, args in programs.iteritems():
++ for evar, args in programs.items():
+ found = False
+- for name, member_name in args['checks'].iteritems():
++ for name, member_name in args['checks'].items():
+ if conf.CheckProgram(self, name, member_name):
+ found = True;
+ break
+@@ -116,9 +116,9 @@
+ def ConfirmLibs(self, conf, libs):
+ conf.AddTests({'CheckPKG': CheckPKG})
+
+- for evar, args in libs.iteritems():
++ for evar, args in libs.items():
+ found = False
+- for name, version in args['checks'].iteritems():
++ for name, version in args['checks'].items():
+ if conf.CheckPKG(name + ' ' + version):
+ self[evar]=name
+ found = True;
+@@ -155,9 +155,9 @@
+ self.AddPostAction(i, Chmod(i, perm))
+ return dir
+
+- InstallProgram = lambda self, dir, source: GpickEnvironment.InstallPerm(self, dir, source, 0755)
+- InstallData = lambda self, dir, source: GpickEnvironment.InstallPerm(self, dir, source, 0644)
+- InstallDataAutoDir = lambda self, dir, relative_dir, source: GpickEnvironment.InstallPermAutoDir(self, dir, relative_dir, source, 0644)
++ InstallProgram = lambda self, dir, source: GpickEnvironment.InstallPerm(self, dir, source, '0755')
++ InstallData = lambda self, dir, source: GpickEnvironment.InstallPerm(self, dir, source, '0644')
++ InstallDataAutoDir = lambda self, dir, relative_dir, source: GpickEnvironment.InstallPermAutoDir(self, dir, relative_dir, source, '0644')
+
+ def GetSourceFiles(self, dir_exclude_pattern, file_exclude_pattern):
+ dir_exclude_prog = re.compile(dir_exclude_pattern)
+--- gpick-gpick-0.2.6rc1/SConscript.orig 2019-07-26 22:26:26.884324858 +0000
++++ gpick-gpick-0.2.6rc1/SConscript 2019-07-26 22:27:07.534897504 +0000
+@@ -49,19 +49,19 @@
+ env.GetVersionInfo()
+
+ try:
+- umask = os.umask(022)
++ umask = os.umask(0o22)
+ except OSError: # ignore on systems that don't support umask
+ pass
+
+-if os.environ.has_key('CC'):
++if os.environ.get('CC'):
+ env['CC'] = os.environ['CC']
+-if os.environ.has_key('CFLAGS'):
++if os.environ.get('CFLAGS'):
+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
+-if os.environ.has_key('CXX'):
++if os.environ.get('CXX'):
+ env['CXX'] = os.environ['CXX']
+-if os.environ.has_key('CXXFLAGS'):
++if os.environ.get('CXXFLAGS'):
+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
+-if os.environ.has_key('LDFLAGS'):
++if os.environ.get('LDFLAGS'):
+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+
+ if not env.GetOption('clean'):
+@@ -97,7 +97,7 @@
+ Decider('MD5-timestamp')
+
+ if not env['TOOLCHAIN'] == 'msvc':
+- if not (os.environ.has_key('CFLAGS') or os.environ.has_key('CXXFLAGS') or os.environ.has_key('LDFLAGS')):
++ if not (os.environ.get('CFLAGS') or os.environ.get('CXXFLAGS') or os.environ.get('LDFLAGS')):
+ if env['DEBUG']:
+ env.Append(
+ CPPFLAGS = ['-Wall', '-g3', '-O0'],
+--- gpick-gpick-0.2.6rc1/source/dbus/SConscript.orig 2019-07-26 22:38:12.841066003 +0000
++++ gpick-gpick-0.2.6rc1/source/dbus/SConscript 2019-07-26 22:39:19.508817931 +0000
+@@ -9,7 +9,7 @@
+ if not local_env.GetOption('clean') and not env['TOOLCHAIN'] == 'msvc':
+ if not env['USE_GTK3']:
+ local_env.ParseConfig('pkg-config --cflags $GIO_PC')
+- else:
++ else:
+ local_env.ParseConfig('pkg-config --cflags $GTK_PC')
+
+ if not env['BUILD_TARGET'] == 'win32':
More information about the arch-commits
mailing list