summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
-rw-r--r--glib.install20
3 files changed, 4 insertions, 25 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 94b4ab0c8893..3197bb73ba66 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
pkgbase = lib32-glib
pkgdesc = Common C routines used by Gtk+ and other libs (32-bit)
pkgver = 1.2.10
- pkgrel = 4
+ pkgrel = 5
url = http://www.gtk.org/
- install = glib.install
arch = x86_64
license = LGPL
makedepends = gcc-multilib
@@ -22,4 +21,3 @@ pkgbase = lib32-glib
sha1sums = 8a25fde3c79567262b3024f4e74c9ca4ee8a6279
pkgname = lib32-glib
-
diff --git a/PKGBUILD b/PKGBUILD
index 0bdceb58f60c..232c7b24ca8c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
_pkgname=glib
pkgname=lib32-glib
pkgver=1.2.10
-pkgrel=4
+pkgrel=5
pkgdesc="Common C routines used by Gtk+ and other libs (32-bit)"
arch=('x86_64')
url="http://www.gtk.org/"
@@ -12,7 +12,6 @@ license=('LGPL')
depends=('lib32-glibc' 'sh')
makedepends=('gcc-multilib')
options=('!makeflags')
-install=glib.install
source=(https://download.gnome.org/sources/glib/1.2/${_pkgname}-${pkgver}.tar.gz
glib-1.2.10-gcc9.patch
gcc340.patch aclocal-fixes.patch glib1-autotools.patch)
@@ -32,6 +31,8 @@ prepare() {
}
build() {
+ export CFLAGS="${CFLAGS} -Wno-error -Wno-format -Wno-format-security"
+ export CXXFLAGS="${CXXFLAGS} -Wno-error -Wno-format -Wno-format-security"
export CC="gcc -m32"
cd ${_pkgname}-${pkgver}
if [[ $CARCH = "i686" ]]; then
diff --git a/glib.install b/glib.install
deleted file mode 100644
index c0046feba0f3..000000000000
--- a/glib.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(glib.info.gz)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
-}