[arch-commits] Commit in lib32-json-c/trunk (PKGBUILD)

2020-07-29 Thread Jan Steffens via arch-commits 
Date: Wednesday, July 29, 2020 @ 22:24:29
  Author: heftig
Revision: 665810

0.15-1

Modified:
  lib32-json-c/trunk/PKGBUILD

--+
 PKGBUILD |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-29 22:15:20 UTC (rev 665809)
+++ PKGBUILD2020-07-29 22:24:29 UTC (rev 665810)
@@ -1,8 +1,8 @@
-# Maintainer: Jan Alexander Steffens (heftig) 
+# Maintainer: Jan Alexander Steffens (heftig) 
 
 pkgname=lib32-json-c
-pkgver=0.14
-pkgrel=4
+pkgver=0.15
+pkgrel=1
 pkgdesc="A JSON implementation in C (32-bit)"
 url="https://github.com/json-c/json-c/wiki;
 license=(MIT)
@@ -10,7 +10,7 @@
 depends=(lib32-glibc json-c)
 makedepends=(git cmake)
 provides=(libjson-c.so)
-_commit=bae2f10c436eaf0d95746cbc5f1c1f0ecb866a8e  # tags/json-c-0.14-20200419^0
+_commit=9021cdcdd01fc9dbcbe1f06391848c2ac915212f  # tags/json-c-0.15-20200726^0
 source=("git+https://github.com/json-c/json-c#commit=$_commit;)
 sha256sums=('SKIP')
 
@@ -29,6 +29,8 @@
   export CC="gcc -m32"
   export CXX="g++ -m32"
   export PKG_CONFIG_PATH="i686-pc-linux-gnu-pkg-config"
+  CFLAGS+=" $CPPFLAGS"
+  CXXFLAGS+=" $CPPFLAGS"
 
   cmake -Hjson-c -Bbuild \
 -DCMAKE_BUILD_TYPE=None \

[arch-commits] Commit in lib32-json-c/trunk (PKGBUILD)

2020-05-05 Thread Jan Steffens via arch-commits 
Date: Tuesday, May 5, 2020 @ 11:15:02
  Author: heftig
Revision: 624919

0.14-4: disable RDRAND due to various issues (#589, #590)

Modified:
  lib32-json-c/trunk/PKGBUILD

--+
 PKGBUILD |9 ++---
 1 file changed, 2 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-05 11:14:57 UTC (rev 624918)
+++ PKGBUILD2020-05-05 11:15:02 UTC (rev 624919)
@@ -2,7 +2,7 @@
 
 pkgname=lib32-json-c
 pkgver=0.14
-pkgrel=3
+pkgrel=4
 pkgdesc="A JSON implementation in C (32-bit)"
 url="https://github.com/json-c/json-c/wiki;
 license=(MIT)
@@ -23,11 +23,6 @@
 
 prepare() {
   cd json-c
-
-  # Detect broken RDRAND during initialization
-  git cherry-pick -n \
-4d36b0287d3ab0912ba8a4790340ca099960b2b0 \
-80863140263be5f2dc630938ed8f0066f8a1ab43
 }
 
 build() {
@@ -40,7 +35,7 @@
 -DCMAKE_INSTALL_PREFIX=/usr \
 -DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
 -DENABLE_THREADING=ON \
--DENABLE_RDRAND=ON
+-DENABLE_RDRAND=OFF
   cmake --build build
 }

[arch-commits] Commit in lib32-json-c/trunk (PKGBUILD)

2020-05-05 Thread Christian Hesse via arch-commits 
Date: Tuesday, May 5, 2020 @ 11:02:43
  Author: eworm
Revision: 624895

upgpkg: lib32-json-c 0.14-2

cherry-pick "Detect broken RDRAND during initialization"

Modified:
  lib32-json-c/trunk/PKGBUILD

--+
 PKGBUILD |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-05 11:01:36 UTC (rev 624894)
+++ PKGBUILD2020-05-05 11:02:43 UTC (rev 624895)
@@ -2,7 +2,7 @@
 
 pkgname=lib32-json-c
 pkgver=0.14
-pkgrel=1
+pkgrel=2
 pkgdesc="A JSON implementation in C (32-bit)"
 url="https://github.com/json-c/json-c/wiki;
 license=(MIT)
@@ -23,6 +23,9 @@
 
 prepare() {
   cd json-c
+
+  # Detect broken RDRAND during initialization
+  git cherry-pick -n 4d36b0287d3ab0912ba8a4790340ca099960b2b0
 }
 
 build() {

[arch-commits] Commit in lib32-json-c/trunk (PKGBUILD)

2020-05-05 Thread Christian Hesse via arch-commits 
Date: Tuesday, May 5, 2020 @ 11:10:13
  Author: eworm
Revision: 624909

upgpkg: lib32-json-c 0.14-3

pull in follow-up

Modified:
  lib32-json-c/trunk/PKGBUILD

--+
 PKGBUILD |6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-05-05 11:10:12 UTC (rev 624908)
+++ PKGBUILD2020-05-05 11:10:13 UTC (rev 624909)
@@ -2,7 +2,7 @@
 
 pkgname=lib32-json-c
 pkgver=0.14
-pkgrel=2
+pkgrel=3
 pkgdesc="A JSON implementation in C (32-bit)"
 url="https://github.com/json-c/json-c/wiki;
 license=(MIT)
@@ -25,7 +25,9 @@
   cd json-c
 
   # Detect broken RDRAND during initialization
-  git cherry-pick -n 4d36b0287d3ab0912ba8a4790340ca099960b2b0
+  git cherry-pick -n \
+4d36b0287d3ab0912ba8a4790340ca099960b2b0 \
+80863140263be5f2dc630938ed8f0066f8a1ab43
 }
 
 build() {

[arch-commits] Commit in lib32-json-c/trunk (PKGBUILD)

2020-04-20 Thread Jan Steffens via arch-commits 
Date: Monday, April 20, 2020 @ 18:52:03
  Author: heftig
Revision: 617075

0.14-1

Modified:
  lib32-json-c/trunk/PKGBUILD

--+
 PKGBUILD |   37 -
 1 file changed, 16 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-20 18:26:51 UTC (rev 617074)
+++ PKGBUILD2020-04-20 18:52:03 UTC (rev 617075)
@@ -1,15 +1,16 @@
 # Maintainer: Jan Alexander Steffens (heftig) 
 
 pkgname=lib32-json-c
-pkgver=0.13.1
-pkgrel=2
+pkgver=0.14
+pkgrel=1
 pkgdesc="A JSON implementation in C (32-bit)"
 url="https://github.com/json-c/json-c/wiki;
 license=(MIT)
 arch=(x86_64)
 depends=(lib32-glibc json-c)
-makedepends=(git)
-_commit=985c46fec39d1d3043f98e8d8cdb9d040131b3bb  # 
tags/json-c-0.13.1-20180305^0
+makedepends=(git cmake)
+provides=(libjson-c.so)
+_commit=bae2f10c436eaf0d95746cbc5f1c1f0ecb866a8e  # tags/json-c-0.14-20200419^0
 source=("git+https://github.com/json-c/json-c#commit=$_commit;)
 sha256sums=('SKIP')
 
@@ -22,36 +23,30 @@
 
 prepare() {
   cd json-c
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd json-c
-
   export CC="gcc -m32"
   export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export PKG_CONFIG_PATH="i686-pc-linux-gnu-pkg-config"
 
-  ./configure \
---prefix=/usr \
---libdir=/usr/lib32 \
---disable-static \
---enable-threading
-  make
+  cmake -Hjson-c -Bbuild \
+-DCMAKE_BUILD_TYPE=None \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_INSTALL_LIBDIR=/usr/lib32 \
+-DENABLE_THREADING=ON \
+-DENABLE_RDRAND=ON
+  cmake --build build
 }
 
 check() {
-  cd json-c
-  make check
+  cmake --build build --target test
 }
 
 package() {
-  cd json-c
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --build build --target install
   rm -r "$pkgdir/usr/include"
-
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s json-c "$pkgdir/usr/share/licenses/$pkgname"
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 json-c/COPYING
 }
 
 # vim:set sw=2 et:

[arch-commits] Commit in lib32-json-c/trunk (PKGBUILD)

2018-08-30 Thread Jan Steffens via arch-commits 
Date: Thursday, August 30, 2018 @ 19:22:48
  Author: heftig
Revision: 375676

0.13.1-2

Added:
  lib32-json-c/trunk/PKGBUILD

--+
 PKGBUILD |   57 +
 1 file changed, 57 insertions(+)

Added: PKGBUILD
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2018-08-30 19:22:48 UTC (rev 375676)
@@ -0,0 +1,57 @@
+# Maintainer: Jan Alexander Steffens (heftig) 
+
+pkgname=lib32-json-c
+pkgver=0.13.1
+pkgrel=2
+pkgdesc="A JSON implementation in C (32-bit)"
+url="https://github.com/json-c/json-c/wiki;
+license=(MIT)
+arch=(x86_64)
+depends=(lib32-glibc json-c)
+makedepends=(git)
+_commit=985c46fec39d1d3043f98e8d8cdb9d040131b3bb  # 
tags/json-c-0.13.1-20180305^0
+source=("git+https://github.com/json-c/json-c#commit=$_commit;)
+sha256sums=('SKIP')
+
+pkgver() {
+  cd json-c
+  local tag="$(git describe --tags --abbrev=0)"
+  local ver="$(git describe --tags)"
+  echo "${tag%-*}${ver#$tag}" | sed 's/^json-c-//;s/-/+/g'
+}
+
+prepare() {
+  cd json-c
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd json-c
+
+  export CC="gcc -m32"
+  export CXX="g++ -m32"
+  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+  ./configure \
+--prefix=/usr \
+--libdir=/usr/lib32 \
+--disable-static \
+--enable-threading
+  make
+}
+
+check() {
+  cd json-c
+  make check
+}
+
+package() {
+  cd json-c
+  make DESTDIR="$pkgdir" install
+  rm -r "$pkgdir/usr/include"
+
+  mkdir -p "$pkgdir/usr/share/licenses"
+  ln -s json-c "$pkgdir/usr/share/licenses/$pkgname"
+}
+
+# vim:set sw=2 et:

[arch-commits] Commit in lib32-json-c/trunk (PKGBUILD)

2017-12-25 Thread Jan Steffens via arch-commits 
Date: Tuesday, December 26, 2017 @ 01:15:52
  Author: heftig
Revision: 276076

0.13-1

Modified:
  lib32-json-c/trunk/PKGBUILD

--+
 PKGBUILD |   29 -
 1 file changed, 16 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-12-26 01:09:33 UTC (rev 276075)
+++ PKGBUILD2017-12-26 01:15:52 UTC (rev 276076)
@@ -2,22 +2,20 @@
 # Maintainer: Jan Alexander Steffens (heftig) 
 # Contributor: Geoffroy Carrier 
 # Contributor: congyiwu 
-_pkgbasename=json-c
-pkgname=lib32-$_pkgbasename
-pkgver=0.12.1
+pkgname=lib32-json-c
+pkgver=0.13
 pkgrel=1
-pkgdesc="A JSON implementation in C (32-bit)"
-url="https://github.com/json-c/json-c/wiki;
+pkgdesc='A JSON implementation in C (32-bit)'
+url='https://github.com/json-c/json-c/wiki'
 license=(MIT)
-arch=(x86_64)
-depends=(lib32-glibc $_pkgbasename)
+arch=('x86_64')
+depends=('lib32-glibc' 'json-c')
 makedepends=(gcc-multilib libtool-multilib)
-options=(!libtool !makeflags)
-source=(https://s3.amazonaws.com/${_pkgbasename}_releases/releases/$_pkgbasename-${pkgver}.tar.gz)
-sha256sums=('2a136451a7932d80b7d197b10441e26e39428d67b1443ec43bbba824705e1123')
+source=('https://github.com/json-c/json-c/archive/json-c-0.13-20171207.tar.gz')
+sha256sums=('26e642456caab38aa9459279b9712ffec52f751e9f46641d28461c244bd6bae6')
 
 build() {
-  cd $_pkgbasename-$pkgver
+  cd json-c-json-c-$pkgver-20171207
   export CC="gcc -m32" PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
   CFLAGS="$CFLAGS -Wno-error"
   ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
@@ -24,12 +22,17 @@
   make
 }
 
+check() {
+  cd json-c-json-c-$pkgver-20171207
+  make check
+}
+
 package() {
-  cd $_pkgbasename-$pkgver
+  cd json-c-json-c-$pkgver-20171207
   make DESTDIR="$pkgdir" install
 
   rm -r "$pkgdir/usr/include"
 
   mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+  ln -s json-c "$pkgdir/usr/share/licenses/$pkgname"
 }

[arch-commits] Commit in lib32-json-c/trunk (PKGBUILD)

2016-06-28 Thread Jan Steffens 
Date: Tuesday, June 28, 2016 @ 07:20:38
  Author: heftig
Revision: 181471

0.12.1-1

Modified:
  lib32-json-c/trunk/PKGBUILD

--+
 PKGBUILD |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-06-28 07:16:41 UTC (rev 181470)
+++ PKGBUILD2016-06-28 07:20:38 UTC (rev 181471)
@@ -4,7 +4,7 @@
 # Contributor: congyiwu 
 _pkgbasename=json-c
 pkgname=lib32-$_pkgbasename
-pkgver=0.12
+pkgver=0.12.1
 pkgrel=1
 pkgdesc="A JSON implementation in C (32-bit)"
 url="https://github.com/json-c/json-c/wiki;
@@ -14,15 +14,12 @@
 makedepends=(gcc-multilib libtool-multilib)
 options=(!libtool !makeflags)
 
source=(https://s3.amazonaws.com/${_pkgbasename}_releases/releases/$_pkgbasename-${pkgver}.tar.gz)
-sha256sums=('000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f')
+sha256sums=('2a136451a7932d80b7d197b10441e26e39428d67b1443ec43bbba824705e1123')
 
 build() {
   cd $_pkgbasename-$pkgver
-
-  export CC="gcc -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-  CFLAGS+=" -Wno-error=unused-but-set-variable"
-
+  export CC="gcc -m32" PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  CFLAGS="$CFLAGS -Wno-error"
   ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
   make
 }

[arch-commits] Commit in lib32-json-c/trunk (PKGBUILD)

2014-06-11 Thread Jan Steffens 
Date: Wednesday, June 11, 2014 @ 23:21:04
  Author: heftig
Revision: 113042

0.12

Modified:
  lib32-json-c/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-11 21:16:34 UTC (rev 113041)
+++ PKGBUILD2014-06-11 21:21:04 UTC (rev 113042)
@@ -4,7 +4,7 @@
 # Contributor: congyiwu congyiwu AT gmail DOT com
 _pkgbasename=json-c
 pkgname=lib32-$_pkgbasename
-pkgver=0.11
+pkgver=0.12
 pkgrel=1
 pkgdesc=A JSON implementation in C (32-bit)
 url=https://github.com/json-c/json-c/wiki;
@@ -14,7 +14,7 @@
 makedepends=(gcc-multilib libtool-multilib)
 options=(!libtool !makeflags)
 
source=(https://s3.amazonaws.com/${_pkgbasename}_releases/releases/$_pkgbasename-${pkgver}.tar.gz)
-sha256sums=('28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c')
+sha256sums=('000c01b2b3f82dcb4261751eb71f1b084404fb7d6a282f06074d3c17078b9f3f')
 
 build() {
   cd $_pkgbasename-$pkgver
@@ -21,6 +21,7 @@
 
   export CC=gcc -m32
   export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
+  CFLAGS+= -Wno-error=unused-but-set-variable
 
   ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
   make

[arch-commits] Commit in lib32-json-c/trunk (PKGBUILD)

2013-06-07 Thread Jan Steffens 
Date: Friday, June 7, 2013 @ 19:06:34
  Author: heftig
Revision: 92524

0.11

Modified:
  lib32-json-c/trunk/PKGBUILD

--+
 PKGBUILD |   27 ++-
 1 file changed, 10 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-07 16:54:42 UTC (rev 92523)
+++ PKGBUILD2013-06-07 17:06:34 UTC (rev 92524)
@@ -2,33 +2,26 @@
 # Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
 # Contributor: Geoffroy Carrier geoffroy.carr...@koon.fr
 # Contributor: congyiwu congyiwu AT gmail DOT com
-
 _pkgbasename=json-c
 pkgname=lib32-$_pkgbasename
-pkgver=0.10
-pkgrel=2
+pkgver=0.11
+pkgrel=1
 pkgdesc=A JSON implementation in C (32-bit)
 url=https://github.com/json-c/json-c/wiki;
-license=(MIT)
-arch=('x86_64')
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=('gcc-multilib' 'libtool-multilib')
-source=(https://github.com/downloads/$_pkgbasename/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz)
-md5sums=('a4edc79410eb894f08d7d52ca9f88732')
-options=(!libtool)
+license=(MIT)
+arch=(x86_64)
+depends=(lib32-glibc $_pkgbasename)
+makedepends=(gcc-multilib libtool-multilib)
+options=(!libtool !makeflags)
+source=(https://s3.amazonaws.com/${_pkgbasename}_releases/releases/$_pkgbasename-${pkgver}.tar.gz)
+sha256sums=('28dfc65145dc0d4df1dfe7701ac173c4e5f9347176c8983edbfac9149494448c')
+
 build() {
   cd $_pkgbasename-$pkgver
 
   export CC=gcc -m32
   export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
 
-  ## from http://pkgs.fedoraproject.org/cgit/json-c.git/tree/json-c.spec
-  # Hack to get json_object_iterator.c compiled
-  sed -e 's/json_object.c/json_object.c json_object_iterator.c/' \
-  -e 's/json_object.h/json_object.h json_object_iterator.h/' \
-  -e 's/json_object.lo/json_object.lo json_object_iterator.lo/' \
-  -i Makefile.in
-
   ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
   make
 }

[arch-commits] Commit in lib32-json-c/trunk (PKGBUILD)

2013-01-27 Thread Jan Steffens 
Date: Monday, January 28, 2013 @ 01:17:51
  Author: heftig
Revision: 83194

0.10-2

Modified:
  lib32-json-c/trunk/PKGBUILD

--+
 PKGBUILD |   24 
 1 file changed, 16 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-01-27 20:20:30 UTC (rev 83193)
+++ PKGBUILD2013-01-28 00:17:51 UTC (rev 83194)
@@ -1,32 +1,40 @@
-# Maintainer: Jan heftig Steffens jan.steff...@gmail.com
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) jan.steff...@gmail.com
 # Contributor: Geoffroy Carrier geoffroy.carr...@koon.fr
 # Contributor: congyiwu congyiwu AT gmail DOT com
 
 _pkgbasename=json-c
 pkgname=lib32-$_pkgbasename
-pkgver=0.9
+pkgver=0.10
 pkgrel=2
 pkgdesc=A JSON implementation in C (32-bit)
-url=http://oss.metaparadigm.com/json-c/;
+url=https://github.com/json-c/json-c/wiki;
 license=(MIT)
 arch=('x86_64')
 depends=('lib32-glibc' $_pkgbasename)
 makedepends=('gcc-multilib' 'libtool-multilib')
-source=(http://oss.metaparadigm.com/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz)
-md5sums=('3a13d264528dcbaf3931b0cede24abae')
+source=(https://github.com/downloads/$_pkgbasename/$_pkgbasename/$_pkgbasename-$pkgver.tar.gz)
+md5sums=('a4edc79410eb894f08d7d52ca9f88732')
 options=(!libtool)
 build() {
-  cd $srcdir/$_pkgbasename-$pkgver
+  cd $_pkgbasename-$pkgver
 
   export CC=gcc -m32
   export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
 
-  ./configure --prefix=/usr --libdir=/usr/lib32
+  ## from http://pkgs.fedoraproject.org/cgit/json-c.git/tree/json-c.spec
+  # Hack to get json_object_iterator.c compiled
+  sed -e 's/json_object.c/json_object.c json_object_iterator.c/' \
+  -e 's/json_object.h/json_object.h json_object_iterator.h/' \
+  -e 's/json_object.lo/json_object.lo json_object_iterator.lo/' \
+  -i Makefile.in
+
+  ./configure --prefix=/usr --disable-static --libdir=/usr/lib32
   make
 }
 
 package() {
-  cd $srcdir/$_pkgbasename-$pkgver
+  cd $_pkgbasename-$pkgver
   make DESTDIR=$pkgdir install
 
   rm -r $pkgdir/usr/include