[arch-commits] Commit in xkbsel/repos/community-x86_64 (4 files)

[Sergej Pupykin]

    Date: Friday, January 21, 2022 @ 18:36:09
  Author: spupykin
Revision: 1112462

archrelease: copy trunk to community-x86_64

Added:
  xkbsel/repos/community-x86_64/PKGBUILD
    (from rev 1112461, xkbsel/trunk/PKGBUILD)
  xkbsel/repos/community-x86_64/build-fix.patch
    (from rev 1112461, xkbsel/trunk/build-fix.patch)
Deleted:
  xkbsel/repos/community-x86_64/PKGBUILD
  xkbsel/repos/community-x86_64/build-fix.patch

-----------------+
 PKGBUILD        |   78 +++++++++++++++++++++++++-----------------------------
 build-fix.patch |   48 ++++++++++++++++-----------------
 2 files changed, 61 insertions(+), 65 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-21 18:36:00 UTC (rev 1112461)
+++ PKGBUILD	2022-01-21 18:36:09 UTC (rev 1112462)
@@ -1,41 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
-
-pkgname=xkbsel
-pkgver=0.13
-pkgrel=10
-pkgdesc="framework for defining, selecting and indicating XKB keyboard mappings"
-arch=('x86_64')
-url="https://www.meduna.org/sw_xkbsel_en.html"
-license=('GPL')
-depends=('gdbm' 'libxaw')
-makedepends=('patch' 'xkeyboard-config')
-source=(https://www.meduna.org/code/$pkgname-$pkgver.tar.gz
-	build-fix.patch)
-sha512sums=('2cefeac975335ab07b6b375f7109d8ac8ba733e4024e6a64c8e8a8757cf194882ccd436937c648ce0f3a7a2112208600f1b5ad2d73c82988a7f8c357362ccfc5'
-            '850e9ee70839597b9b7485cec1eecf2f6c05da0392238620ad05397695897faf8a4fec1925f402eb64d61ecbeb1b7d42149db9f8b9436af3eeb27c675a3287fe')
-
-prepare() {
-  cd "$srcdir"/$pkgname-$pkgver
-  sed -i 's|\${CC-cc}|${CC-cc} -O2 |g' ./configure
-}
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-#  autoreconf
-
-  patch -Np1 <../build-fix.patch
-  export CFLAGS="$CFLAGS -I/usr/include/gdbm -DHAVE_NDBM_H"
-  export LDFLAGS="-lgdbm -lgdbm_compat"
-
-  ./configure --prefix=/usr --localstatedir=/var/lib --sysconfdir=/etc/xkbsel \
-		--build=`uname -m` --host=`uname -m` --target=`uname -m` \
-		--mandir=/usr/share/man
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}

Copied: xkbsel/repos/community-x86_64/PKGBUILD (from rev 1112461, xkbsel/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-01-21 18:36:09 UTC (rev 1112462)
@@ -0,0 +1,37 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+
+pkgname=xkbsel
+pkgver=0.13
+pkgrel=11
+pkgdesc="framework for defining, selecting and indicating XKB keyboard mappings"
+arch=('x86_64')
+url="https://www.meduna.org/sw_xkbsel_en.html"
+license=('GPL')
+depends=('gdbm' 'libxaw')
+makedepends=('patch' 'xkeyboard-config')
+source=(https://www.meduna.org/code/$pkgname-$pkgver.tar.gz
+	build-fix.patch)
+sha512sums=('2cefeac975335ab07b6b375f7109d8ac8ba733e4024e6a64c8e8a8757cf194882ccd436937c648ce0f3a7a2112208600f1b5ad2d73c82988a7f8c357362ccfc5'
+            '850e9ee70839597b9b7485cec1eecf2f6c05da0392238620ad05397695897faf8a4fec1925f402eb64d61ecbeb1b7d42149db9f8b9436af3eeb27c675a3287fe')
+
+prepare() {
+  cd "$srcdir"/$pkgname-$pkgver
+  sed -i 's|\${CC-cc}|${CC-cc} -O2 |g' ./configure
+  patch -Np1 <../build-fix.patch
+}
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+  export CFLAGS="$CFLAGS -I/usr/include/gdbm -DHAVE_NDBM_H -ffat-lto-objects"
+  export LDFLAGS="-lgdbm -lgdbm_compat"
+  ./configure --prefix=/usr --localstatedir=/var/lib --sysconfdir=/etc/xkbsel \
+		--build=`uname -m` --host=`uname -m` --target=`uname -m` \
+		--mandir=/usr/share/man
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}

Deleted: build-fix.patch
===================================================================
--- build-fix.patch	2022-01-21 18:36:00 UTC (rev 1112461)
+++ build-fix.patch	2022-01-21 18:36:09 UTC (rev 1112462)
@@ -1,24 +0,0 @@
-diff -wbBur xkbsel-0.13/configure xkbsel-0.13.my/configure
---- xkbsel-0.13/configure	2000-04-09 13:37:02.000000000 +0400
-+++ xkbsel-0.13.my/configure	2006-07-24 17:13:10.000000000 +0400
-@@ -6118,7 +6118,7 @@
-   { echo "configure: error: "Cannot find library containing dbm_open"" 1>&2; exit 1; }
- fi
- 
--x11xkbdir=$ac_x_libraries/X11/xkb
-+x11xkbdir=/usr/share/X11/xkb
- test -d $x11xkbdir || { echo "configure: error: "Directory $x11xkbdir does not exist"" 1>&2; exit 1; }
- 
- 
-diff -wbBur xkbsel-0.13/libs/Makefile.in xkbsel-0.13.my/libs/Makefile.in
---- xkbsel-0.13/libs/Makefile.in	2000-04-09 13:51:01.000000000 +0400
-+++ xkbsel-0.13.my/libs/Makefile.in	2006-07-24 17:11:52.000000000 +0400
-@@ -452,7 +452,7 @@
- 
- 
- install-data-local:
--	$(mkinstalldirs) ${sysxkmdir}
-+	$(mkinstalldirs) $(DESTDIR)${sysxkmdir}
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.

Copied: xkbsel/repos/community-x86_64/build-fix.patch (from rev 1112461, xkbsel/trunk/build-fix.patch)
===================================================================
--- build-fix.patch	                        (rev 0)
+++ build-fix.patch	2022-01-21 18:36:09 UTC (rev 1112462)
@@ -0,0 +1,24 @@
+diff -wbBur xkbsel-0.13/configure xkbsel-0.13.my/configure
+--- xkbsel-0.13/configure	2000-04-09 13:37:02.000000000 +0400
++++ xkbsel-0.13.my/configure	2006-07-24 17:13:10.000000000 +0400
+@@ -6118,7 +6118,7 @@
+   { echo "configure: error: "Cannot find library containing dbm_open"" 1>&2; exit 1; }
+ fi
+ 
+-x11xkbdir=$ac_x_libraries/X11/xkb
++x11xkbdir=/usr/share/X11/xkb
+ test -d $x11xkbdir || { echo "configure: error: "Directory $x11xkbdir does not exist"" 1>&2; exit 1; }
+ 
+ 
+diff -wbBur xkbsel-0.13/libs/Makefile.in xkbsel-0.13.my/libs/Makefile.in
+--- xkbsel-0.13/libs/Makefile.in	2000-04-09 13:51:01.000000000 +0400
++++ xkbsel-0.13.my/libs/Makefile.in	2006-07-24 17:11:52.000000000 +0400
+@@ -452,7 +452,7 @@
+ 
+ 
+ install-data-local:
+-	$(mkinstalldirs) ${sysxkmdir}
++	$(mkinstalldirs) $(DESTDIR)${sysxkmdir}
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.