[arch-commits] Commit in lib32-librsvg/repos/multilib-x86_64 (4 files)

Jan Steffens heftig at gemini.archlinux.org
Sat Jun 11 10:48:10 UTC 2022


    Date: Saturday, June 11, 2022 @ 10:48:09
  Author: heftig
Revision: 1232950

archrelease: copy trunk to multilib-x86_64

Added:
  lib32-librsvg/repos/multilib-x86_64/PKGBUILD
    (from rev 1232948, lib32-librsvg/trunk/PKGBUILD)
  lib32-librsvg/repos/multilib-x86_64/multilib.diff
    (from rev 1232948, lib32-librsvg/trunk/multilib.diff)
Deleted:
  lib32-librsvg/repos/multilib-x86_64/PKGBUILD
  lib32-librsvg/repos/multilib-x86_64/multilib.diff

---------------+
 PKGBUILD      |  146 ++++++++++++++++++++++++++++----------------------------
 multilib.diff |   58 +++++++++++-----------
 2 files changed, 102 insertions(+), 102 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-11 10:48:08 UTC (rev 1232949)
+++ PKGBUILD	2022-06-11 10:48:09 UTC (rev 1232950)
@@ -1,73 +0,0 @@
-# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
-# Contributor: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: jtts <jussaar at mbnet.fi>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=lib32-librsvg
-pkgver=2.54.3
-pkgrel=1
-epoch=2
-pkgdesc="SVG rendering library (32-bit)"
-url="https://wiki.gnome.org/Projects/LibRsvg"
-arch=(x86_64)
-license=(LGPL)
-depends=(lib32-cairo lib32-freetype2 lib32-gdk-pixbuf2 lib32-glib2
-         lib32-harfbuzz lib32-libxml2 lib32-pango librsvg)
-makedepends=(gobject-introspection git rust lib32-rust-libs)
-checkdepends=(ttf-dejavu)
-options=(debug)
-_commit=63ef9f647f02fffed298e46de61a8a671acbd911  # tags/2.54.3^0
-source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit"
-        multilib.diff)
-sha256sums=('SKIP'
-            '2bf8570948e0ff3da4c26a8c5d600bd3a66f26bc81abcaeb437df28c01aa9a2a')
-
-pkgver() {
-  cd librsvg
-  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
-}
-
-prepare() {
-  cd librsvg
-
-  # Hack to remove docs and cross-compile rust only
-  git apply -3 ../multilib.diff
-
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-# Use LTO
-export CARGO_PROFILE_RELEASE_LTO=true CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
-
-# Use debug
-export CARGO_PROFILE_RELEASE_DEBUG=2
-
-build() {
-  cd librsvg
-
-  export CC='gcc -m32'
-  export CXX='g++ -m32'
-  export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
-  export RUST_TARGET=i686-unknown-linux-gnu
-
-  ./configure --prefix=/usr --disable-static --disable-vala \
-    --disable-introspection --libdir=/usr/lib32
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
-  make
-}
-
-check() {
-  # Test suite is very dependent on the versions of
-  # Cairo, Pango, FreeType and HarfBuzz
-  make -C librsvg check || :
-}
-
-package() {
-  provides=(librsvg-${pkgver%%.*}.so)
-
-  make -C librsvg DESTDIR="$pkgdir" install
-
-  rm -r "$pkgdir"/usr/{bin,include,share}
-}
-
-# vim:set sw=2 et:

Copied: lib32-librsvg/repos/multilib-x86_64/PKGBUILD (from rev 1232948, lib32-librsvg/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-06-11 10:48:09 UTC (rev 1232950)
@@ -0,0 +1,73 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
+# Contributor: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: jtts <jussaar at mbnet.fi>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=lib32-librsvg
+pkgver=2.54.4
+pkgrel=1
+epoch=2
+pkgdesc="SVG rendering library (32-bit)"
+url="https://wiki.gnome.org/Projects/LibRsvg"
+arch=(x86_64)
+license=(LGPL)
+depends=(lib32-cairo lib32-freetype2 lib32-gdk-pixbuf2 lib32-glib2
+         lib32-harfbuzz lib32-libxml2 lib32-pango librsvg)
+makedepends=(gobject-introspection git rust lib32-rust-libs)
+checkdepends=(ttf-dejavu)
+options=(debug)
+_commit=6539eef7be69c3f7089489c9a8f39d085e677bad  # tags/2.54.4^0
+source=("git+https://gitlab.gnome.org/GNOME/librsvg.git#commit=$_commit"
+        multilib.diff)
+sha256sums=('SKIP'
+            '2bf8570948e0ff3da4c26a8c5d600bd3a66f26bc81abcaeb437df28c01aa9a2a')
+
+pkgver() {
+  cd librsvg
+  git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
+}
+
+prepare() {
+  cd librsvg
+
+  # Hack to remove docs and cross-compile rust only
+  git apply -3 ../multilib.diff
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+# Use LTO
+export CARGO_PROFILE_RELEASE_LTO=true CARGO_PROFILE_RELEASE_CODEGEN_UNITS=1
+
+# Use debug
+export CARGO_PROFILE_RELEASE_DEBUG=2
+
+build() {
+  cd librsvg
+
+  export CC='gcc -m32'
+  export CXX='g++ -m32'
+  export PKG_CONFIG=i686-pc-linux-gnu-pkg-config
+  export RUST_TARGET=i686-unknown-linux-gnu
+
+  ./configure --prefix=/usr --disable-static --disable-vala \
+    --disable-introspection --libdir=/usr/lib32
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+  make
+}
+
+check() {
+  # Test suite is very dependent on the versions of
+  # Cairo, Pango, FreeType and HarfBuzz
+  make -C librsvg check || :
+}
+
+package() {
+  provides=(librsvg-${pkgver%%.*}.so)
+
+  make -C librsvg DESTDIR="$pkgdir" install
+
+  rm -r "$pkgdir"/usr/{bin,include,share}
+}
+
+# vim:set sw=2 et:

Deleted: multilib.diff
===================================================================
--- multilib.diff	2022-06-11 10:48:08 UTC (rev 1232949)
+++ multilib.diff	2022-06-11 10:48:09 UTC (rev 1232950)
@@ -1,29 +0,0 @@
-diff --git i/Makefile.am w/Makefile.am
-index 83e73c38..8cb853c7 100644
---- i/Makefile.am
-+++ w/Makefile.am
-@@ -141,9 +141,7 @@ else
- CARGO_RELEASE_ARGS=--release
- endif
- 
--if CROSS_COMPILING
- CARGO_TARGET_ARGS=--target=$(RUST_TARGET)
--endif
- 
- CARGO_VERBOSE = $(cargo_verbose_$(V))
- cargo_verbose_ = $(cargo_verbose_$(AM_DEFAULT_VERBOSITY))
-diff --git i/configure.ac w/configure.ac
-index 9abc587e..d3be718f 100644
---- i/configure.ac
-+++ w/configure.ac
-@@ -278,9 +278,7 @@ AC_ARG_VAR(RUST_TARGET, [Set rust target (default=$host)])
- : ${RUST_TARGET:=$host}
- 
- AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = xyes])
--AS_IF([test "x$cross_compiling" = "xyes"], [
--	RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR"
--])
-+RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR"
- AC_SUBST([RUST_TARGET_SUBDIR])
- 
- dnl ===========================================================================

Copied: lib32-librsvg/repos/multilib-x86_64/multilib.diff (from rev 1232948, lib32-librsvg/trunk/multilib.diff)
===================================================================
--- multilib.diff	                        (rev 0)
+++ multilib.diff	2022-06-11 10:48:09 UTC (rev 1232950)
@@ -0,0 +1,29 @@
+diff --git i/Makefile.am w/Makefile.am
+index 83e73c38..8cb853c7 100644
+--- i/Makefile.am
++++ w/Makefile.am
+@@ -141,9 +141,7 @@ else
+ CARGO_RELEASE_ARGS=--release
+ endif
+ 
+-if CROSS_COMPILING
+ CARGO_TARGET_ARGS=--target=$(RUST_TARGET)
+-endif
+ 
+ CARGO_VERBOSE = $(cargo_verbose_$(V))
+ cargo_verbose_ = $(cargo_verbose_$(AM_DEFAULT_VERBOSITY))
+diff --git i/configure.ac w/configure.ac
+index 9abc587e..d3be718f 100644
+--- i/configure.ac
++++ w/configure.ac
+@@ -278,9 +278,7 @@ AC_ARG_VAR(RUST_TARGET, [Set rust target (default=$host)])
+ : ${RUST_TARGET:=$host}
+ 
+ AM_CONDITIONAL([CROSS_COMPILING], [test "x$cross_compiling" = xyes])
+-AS_IF([test "x$cross_compiling" = "xyes"], [
+-	RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR"
+-])
++RUST_TARGET_SUBDIR="$RUST_TARGET/$RUST_TARGET_SUBDIR"
+ AC_SUBST([RUST_TARGET_SUBDIR])
+ 
+ dnl ===========================================================================



More information about the arch-commits mailing list