summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authordudemanguy2017-07-12 14:40:09 -0500
committerdudemanguy2017-07-12 14:40:09 -0500
commit0543959da2aedf8a87a096b67116fc5bcd339b59 (patch)
treeac72f7e82f510a814dd9e064934e29c08341c999
parente0751ce67be29b2825bba5dd04ed1504f1964866 (diff)
downloadaur-0543959da2aedf8a87a096b67116fc5bcd339b59.tar.gz
file deletion
-rw-r--r--.SRCINFO33
-rw-r--r--PKGBUILD74
-rw-r--r--revert-warn-glib-compile-schemas.patch33
3 files changed, 67 insertions, 73 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4b78c3ae2ef..cf2378c7c5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,40 +1,45 @@
# Generated by mksrcinfo v8
-# Wed Jul 12 19:19:46 UTC 2017
+# Wed Jul 12 19:39:43 UTC 2017
pkgbase = glib2-patched-thumbnailer
pkgdesc = GLib2 patched with ahodesuka's thumbnailer patch.
- pkgver = 2.50.2
+ pkgver = 2.52.3
pkgrel = 1
url = http://gist.github.com/ahodesuka/49c1d0eea4b64f24c4c7
arch = i686
arch = x86_64
- license = LGPL
checkdepends = desktop-file-utils
checkdepends = dbus
makedepends = gettext
+ makedepends = gtk-doc
+ makedepends = libffi
+ makedepends = pcre
makedepends = zlib
makedepends = shared-mime-info
makedepends = python
makedepends = libelf
makedepends = git
- depends = pcre
- depends = libffi
- depends = tumbler
- optdepends = python: for gdbus-codegen and gtester-report
- optdepends = libelf: gresource inspection tool
- provides = glib2
+ makedepends = util-linux
+ provides = glib2=2.52.3
+ provides = glib2-docs
conflicts = glib2
- options = !docs
- options = !emptydirs
- source = git://git.gnome.org/glib#commit=224f8171dceca920cfd8a4b446726b7610cdafd9
+ source = git://git.gnome.org/glib#commit=90bb8778f2eabf00bee5bff1259c48f1e7b791b8
source = glib-compile-schemas.hook
source = gio-querymodules.hook
- source = revert-warn-glib-compile-schemas.patch
+ source = skip-broken-timer-test.patch
source = https://gist.githubusercontent.com/ahodesuka/49c1d0eea4b64f24c4c7/raw/d0edf118e1c27700300038c1d82b3ff775c0216b/glib-thumbnailer.patch
sha256sums = SKIP
sha256sums = e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3
sha256sums = 5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6
- sha256sums = 049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97
+ sha256sums = a39dc8c1c1707053d565d5b198b1f03f7c55b31e11335a1bfdc3f9803b114d5d
sha256sums = 1a4673380fbdf8e8e5de3367089de6c97025633e54010575de63c5ab6c8a044d
pkgname = glib2-patched-thumbnailer
+ license = LGPL
+ depends = pcre
+ depends = libffi
+ depends = tumbler
+ depends = libutil-linux
+ optdepends = python: for gdbus-codegen and gtester-report
+ optdepends = libelf: gresource inspection tool
+ options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index 7149d7eb586..12300f945cb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,31 @@
-# Maintainer: Vaporeon <vaporeon@vaporeon.io>
+# Maintainer: dudemanguy <random342@openmailbox.org>
+# Contributor: Vaporeon <vaporeon@vaporeon.io>
# Contributor: Jan de Groot <jgc@archlinux.org>
+pkgbase=glib2-patched-thumbnailer
pkgname=glib2-patched-thumbnailer
-pkgver=2.50.2
+pkgver=2.52.3
pkgrel=1
pkgdesc="GLib2 patched with ahodesuka's thumbnailer patch."
url="http://gist.github.com/ahodesuka/49c1d0eea4b64f24c4c7"
arch=(i686 x86_64)
-provides=(glib2)
-conflicts=(glib2)
-makedepends=('gettext' 'zlib' 'shared-mime-info' 'python' 'libelf' 'git')
-depends=('pcre' 'libffi' 'tumbler')
-optdepends=('python: for gdbus-codegen and gtester-report'
- 'libelf: gresource inspection tool')
+provides=("glib2=$pkgver" "glib2-docs")
+conflicts=('glib2')
+makedepends=('gettext' 'gtk-doc' 'libffi' 'pcre' 'zlib' 'shared-mime-info' 'python' 'libelf' 'git' 'util-linux')
checkdepends=(desktop-file-utils dbus)
-options=('!docs' '!emptydirs')
-license=('LGPL')
-_commit=224f8171dceca920cfd8a4b446726b7610cdafd9 # tags/2.50.2^0
-_patchver=d0edf118e1c27700300038c1d82b3ff775c0216b
+_commit=90bb8778f2eabf00bee5bff1259c48f1e7b791b8 # tags/2.52.3^0
+_patchver=d0edf118e1c27700300038c1d82b3ff775c0216b
source=("git://git.gnome.org/glib#commit=$_commit"
glib-compile-schemas.hook
gio-querymodules.hook
- revert-warn-glib-compile-schemas.patch
+ skip-broken-timer-test.patch
https://gist.githubusercontent.com/ahodesuka/49c1d0eea4b64f24c4c7/raw/$_patchver/glib-thumbnailer.patch)
sha256sums=('SKIP'
'e1123a5d85d2445faac33f6dae1085fdd620d83279a4e130a83fe38db52b62b3'
'5ba204a2686304b1454d401a39a9d27d09dd25e4529664e3fd565be3d439f8b6'
- '049240975cd2f1c88fbe7deb28af14d4ec7d2640495f7ca8980d873bb710cc97'
+ 'a39dc8c1c1707053d565d5b198b1f03f7c55b31e11335a1bfdc3f9803b114d5d'
'1a4673380fbdf8e8e5de3367089de6c97025633e54010575de63c5ab6c8a044d')
pkgver() {
@@ -38,7 +35,12 @@ pkgver() {
prepare() {
cd glib
- patch -Rp1 -i ../revert-warn-glib-compile-schemas.patch
+ git revert -n 6560b37450cd # Noisy glib-compile-schemas
+
+ # Rounding error in timer tests?
+ # GLib:ERROR:timer.c:38:test_timer_basic: assertion failed (micros == ((guint64)(elapsed * 1e6)) % 1000000): (1 == 0)
+ [[ $CARCH == i686 ]] && patch -Np1 -i ../skip-broken-timer-test.patch
+
patch -Np1 -i ../glib-thumbnailer.patch
NOCONFIGURE=1 ./autogen.sh
}
@@ -48,26 +50,46 @@ build() {
./configure --prefix=/usr --libdir=/usr/lib \
--sysconfdir=/etc \
--with-pcre=system \
- --disable-fam
+ --disable-fam \
+ --enable-gtk-doc \
+ $(check_option debug y && echo --enable-debug=yes)
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
make
}
-# check() {
-# cd glib
-# if ! make check; then
-# make check
-# fi
-# }
+#seems to get stuck after live-g-file 2 /live-g-file/create_structure for some reason; skip this
+#check() {
+# cd glib
+# make check
+#}
-package() {
- cd glib
- make completiondir=/usr/share/bash-completion/completions DESTDIR="$pkgdir" install
+package_glib2-patched-thumbnailer() {
+ depends=('pcre' 'libffi' 'tumbler' 'libutil-linux')
+ optdepends=('python: for gdbus-codegen and gtester-report'
+ 'libelf: gresource inspection tool')
+ options=(!emptydirs)
+ license=(LGPL)
- chmod -x "$pkgdir"/usr/share/bash-completion/completions/*
+ cd glib
+ make DESTDIR="$pkgdir" install
+ rm -r "$pkgdir/usr/share/gtk-doc"
# install hooks
install -d "$pkgdir/usr/share/libalpm/hooks/"
install -m644 "$srcdir"/{glib-compile-schemas,gio-querymodules}.hook \
"$pkgdir/usr/share/libalpm/hooks/"
}
+
+package_glib2-docs() {
+ pkgdesc="Documentation for glib2"
+ conflicts=(gobject2-docs)
+ replaces=(gobject2-docs)
+ license=(custom)
+ options=(!emptydirs)
+
+ cd glib/docs
+ make DESTDIR="$pkgdir" install
+ rm -r "$pkgdir/usr/share/man"
+
+ install -Dm644 reference/COPYING "$pkgdir/usr/share/licenses/glib2-docs/COPYING"
+}
diff --git a/revert-warn-glib-compile-schemas.patch b/revert-warn-glib-compile-schemas.patch
deleted file mode 100644
index 75b05103cd0..00000000000
--- a/revert-warn-glib-compile-schemas.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6560b37450cd19c4a7c7b690e279fe97b7bfdcaa Mon Sep 17 00:00:00 2001
-From: Ryan Lortie <desrt@desrt.ca>
-Date: Thu, 12 Apr 2012 23:55:34 +0000
-Subject: glib-compile-schemas: warn about bad dconf paths
-
-For quite some time the recommended usage of GSettings and dconf has
-been to use paths like /org/gnome/example/. Use of /apps/ has spilled
-over from GConf and is continuing to make its way into a number of
-applications as they port.
-
-glib-compile-schemas will now warn about these types of paths being
-used. This generates a lot of noise, but hopefully it will reduce the
-number of ported applications making this mistake.
----
-diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
-index cf02389..27d0181 100644
---- a/gio/glib-compile-schemas.c
-+++ b/gio/glib-compile-schemas.c
-@@ -1204,6 +1204,12 @@ parse_state_start_schema (ParseState *state,
- return;
- }
-
-+ if (path && (g_str_has_prefix (path, "/apps/") ||
-+ g_str_has_prefix (path, "/desktop/") ||
-+ g_str_has_prefix (path, "/system/")))
-+ g_printerr ("warning: Schema '%s' has path '%s'. Paths starting with "
-+ "'/apps/', '/desktop/' or '/system/' are deprecated.\n", id, path);
-+
- state->schema_state = schema_state_new (path, gettext_domain,
- extends, extends_name, list_of);
-
---
-cgit v0.9.0.2