diff options
| author | Lukas Sabota | 2020-06-09 15:30:37 -0400 |
|---|---|---|
| committer | Lukas Sabota | 2020-06-09 15:30:37 -0400 |
| commit | cee3cb5b11a6a4622951687d4f334a776586618d (patch) | |
| tree | ac5d4678ed2f41a0ca2bc99d295f06afa3e1b577 | |
| parent | cc5178d7160e645c5c555fe7ae949e14abdcbded (diff) | |
| download | aur-cee3cb5b11a6a4622951687d4f334a776586618d.tar.gz | |
host patch locally since fedoraproject is unreliable mirror
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | glib-1.2.10-gcc9.patch | 39 |
3 files changed, 43 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = lib32-glib pkgdesc = Common C routines used by Gtk+ and other libs (32-bit) pkgver = 1.2.10 - pkgrel = 2 + pkgrel = 3 url = http://www.gtk.org/ install = glib.install arch = x86_64 @@ -11,7 +11,7 @@ pkgbase = lib32-glib depends = sh options = !makeflags source = ftp://ftp.gnome.org/pub/gnome/sources/glib/1.2/glib-1.2.10.tar.gz - source = https://src.fedoraproject.org/rpms/glib/raw/master/f/glib-1.2.10-gcc9.patch + source = glib-1.2.10-gcc9.patch source = gcc340.patch source = aclocal-fixes.patch source = glib1-autotools.patch @@ -4,7 +4,7 @@ _pkgname=glib pkgname=lib32-glib pkgver=1.2.10 -pkgrel=2 +pkgrel=3 pkgdesc="Common C routines used by Gtk+ and other libs (32-bit)" arch=('x86_64') url="http://www.gtk.org/" @@ -14,7 +14,7 @@ makedepends=('gcc-multilib') options=('!makeflags') install=glib.install source=(ftp://ftp.gnome.org/pub/gnome/sources/glib/1.2/${_pkgname}-${pkgver}.tar.gz - https://src.fedoraproject.org/rpms/glib/raw/master/f/glib-1.2.10-gcc9.patch + glib-1.2.10-gcc9.patch gcc340.patch aclocal-fixes.patch glib1-autotools.patch) sha1sums=('e5a9361c594608d152d5d9650154c2e3260b87fa' '9e675101003cd97da0b42bf04fc6489197a822c7' diff --git a/glib-1.2.10-gcc9.patch b/glib-1.2.10-gcc9.patch new file mode 100644 index 000000000000..36547e4fbbab --- /dev/null +++ b/glib-1.2.10-gcc9.patch @@ -0,0 +1,39 @@ +--- glib.h ++++ glib.h +@@ -535,9 +535,10 @@ typedef gint32 GTime; + if (__builtin_constant_p (val)) \ + __v = GUINT16_SWAP_LE_BE_CONSTANT (val); \ + else \ +- __asm__ __const__ ("rorw $8, %w0" \ ++ __asm__ ("rorw $8, %w0" \ + : "=r" (__v) \ +- : "0" ((guint16) (val))); \ ++ : "0" ((guint16) (val)) \ ++ : "cc"); \ + __v; })) + # define GUINT16_SWAP_LE_BE(val) (GUINT16_SWAP_LE_BE_X86 (val)) + # if !defined(__i486__) && !defined(__i586__) \ +@@ -548,11 +549,12 @@ typedef gint32 GTime; + if (__builtin_constant_p (val)) \ + __v = GUINT32_SWAP_LE_BE_CONSTANT (val); \ + else \ +- __asm__ __const__ ("rorw $8, %w0\n\t" \ ++ __asm__ ("rorw $8, %w0\n\t" \ + "rorl $16, %0\n\t" \ + "rorw $8, %w0" \ + : "=r" (__v) \ +- : "0" ((guint32) (val))); \ ++ : "0" ((guint32) (val)) \ ++ : "cc"); \ + __v; })) + # else /* 486 and higher has bswap */ + # define GUINT32_SWAP_LE_BE_X86(val) \ +@@ -561,7 +563,7 @@ typedef gint32 GTime; + if (__builtin_constant_p (val)) \ + __v = GUINT32_SWAP_LE_BE_CONSTANT (val); \ + else \ +- __asm__ __const__ ("bswap %0" \ ++ __asm__ ("bswap %0" \ + : "=r" (__v) \ + : "0" ((guint32) (val))); \ + __v; })) |