[arch-commits] Commit in gtk3/repos/extra-x86_64 (12 files)

Jan Steffens heftig at archlinux.org
Sun Nov 26 15:35:05 UTC 2017


    Date: Sunday, November 26, 2017 @ 15:35:03
  Author: heftig
Revision: 310956

archrelease: copy trunk to extra-x86_64

Added:
  gtk3/repos/extra-x86_64/PKGBUILD
    (from rev 310955, gtk3/trunk/PKGBUILD)
  gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook
    (from rev 310955, gtk3/trunk/gtk-query-immodules-3.0.hook)
  gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook
    (from rev 310955, gtk3/trunk/gtk-update-icon-cache.hook)
  gtk3/repos/extra-x86_64/gtk-update-icon-cache.script
    (from rev 310955, gtk3/trunk/gtk-update-icon-cache.script)
  gtk3/repos/extra-x86_64/gtk3.install
    (from rev 310955, gtk3/trunk/gtk3.install)
  gtk3/repos/extra-x86_64/settings.ini
    (from rev 310955, gtk3/trunk/settings.ini)
Deleted:
  gtk3/repos/extra-x86_64/PKGBUILD
  gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook
  gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook
  gtk3/repos/extra-x86_64/gtk-update-icon-cache.script
  gtk3/repos/extra-x86_64/gtk3.install
  gtk3/repos/extra-x86_64/settings.ini

------------------------------+
 PKGBUILD                     |  190 ++++++++++++++++++-----------------------
 gtk-query-immodules-3.0.hook |   22 ++--
 gtk-update-icon-cache.hook   |   26 ++---
 gtk-update-icon-cache.script |   20 ++--
 gtk3.install                 |    6 -
 settings.ini                 |    8 -
 6 files changed, 127 insertions(+), 145 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-26 15:34:20 UTC (rev 310955)
+++ PKGBUILD	2017-11-26 15:35:03 UTC (rev 310956)
@@ -1,104 +0,0 @@
-# $Id$
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
-# Contributor: Ionut Biru <ibiru at archlinux.org>
-
-pkgbase=gtk3
-pkgname=(gtk3 gtk-update-icon-cache gtk3-print-backends)
-pkgver=3.22.26
-pkgrel=1
-pkgdesc="GObject-based multi-platform GUI toolkit"
-arch=(i686 x86_64)
-url="http://www.gtk.org/"
-depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf
-         libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
-         adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa
-         cantarell-fonts)
-makedepends=(gobject-introspection libcanberra gtk-doc git colord rest libcups glib2-docs
-             sassc)
-license=(LGPL)
-_commit=77a4e2ec3759648e85a5172bb9fbdedcd7370023  # tags/3.22.26^0
-source=("git+https://git.gnome.org/browse/gtk+#commit=$_commit"
-        settings.ini
-        gtk-query-immodules-3.0.hook
-        gtk-update-icon-cache.hook
-        gtk-update-icon-cache.script)
-sha256sums=('SKIP'
-            '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
-            'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
-            '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
-            'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
-
-pkgver() {
-  cd gtk+
-  git describe --tags | sed 's/-/+/g'
-}
-
-prepare() {
-  mkdir print-backends
-  cd gtk+
-  NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
-  cd gtk+
-
-  CXX=/bin/false ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --disable-schemas-compile \
-    --enable-x11-backend \
-    --enable-broadway-backend \
-    --enable-wayland-backend \
-    --enable-gtk-doc
-
-  #https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make
-}
-
-package_gtk3() {
-  depends+=(gtk-update-icon-cache)
-  optdepends=('libcanberra: gtk3-widget-factory demo'
-              'gtk3-print-backends: Printing')
-  install=gtk3.install
-
-  cd gtk+
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
-  install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
-
-  # split this out to use with gtk2 too
-  rm "$pkgdir/usr/bin/gtk-update-icon-cache"
-
-  cd "$pkgdir"
-  for _f in usr/lib/*/*/printbackends/*; do
-    case $_f in
-      *-file.so|*-lpr.so) continue ;;
-    esac
-
-    mkdir -p "$srcdir/print-backends/${_f%/*}"
-    mv "$_f" "$srcdir/print-backends/$_f"
-  done
-}
-
-package_gtk-update-icon-cache() {
-  pkgdesc="GTK+ icon cache updater"
-  depends=(gdk-pixbuf2 hicolor-icon-theme)
-
-  cd gtk+
-  install -D gtk/gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
-  install -Dm644 ../gtk-update-icon-cache.hook "$pkgdir/usr/share/libalpm/hooks/gtk-update-icon-cache.hook"
-  install -D ../gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
-}
-
-package_gtk3-print-backends() {
-  pkgdesc="Print backends for GTK3"
-  depends=(gtk3 rest colord libcups)
-  groups=(gnome)
-
-  mv print-backends/* "$pkgdir"
-}
-
-# vim:set et sw=2:

Copied: gtk3/repos/extra-x86_64/PKGBUILD (from rev 310955, gtk3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-11-26 15:35:03 UTC (rev 310956)
@@ -0,0 +1,86 @@
+# $Id$
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgbase=gtk3
+pkgname=(gtk3 gtk-update-icon-cache)
+pkgver=3.22.26+47+g3a1a7135a2
+pkgrel=1
+pkgdesc="GObject-based multi-platform GUI toolkit"
+arch=(x86_64)
+url="http://www.gtk.org/"
+depends=(atk cairo libxcursor libxinerama libxrandr libxi libepoxy gdk-pixbuf2 dconf
+         libxcomposite libxdamage pango shared-mime-info at-spi2-atk wayland libxkbcommon
+         adwaita-icon-theme json-glib librsvg wayland-protocols desktop-file-utils mesa
+         cantarell-fonts colord rest libcups libcanberra libcloudproviders)
+makedepends=(gobject-introspection gtk-doc git glib2-docs sassc)
+license=(LGPL)
+_commit=3a1a7135a276f2b6336c7566f6342da739a41d39  # gtk-3-22
+source=("git+https://git.gnome.org/browse/gtk+#commit=$_commit"
+        settings.ini
+        gtk-query-immodules-3.0.hook
+        gtk-update-icon-cache.hook
+        gtk-update-icon-cache.script)
+sha256sums=('SKIP'
+            '01fc1d81dc82c4a052ac6e25bf9a04e7647267cc3017bc91f9ce3e63e5eb9202'
+            'de46e5514ff39a7a65e01e485e874775ab1c0ad20b8e94ada43f4a6af1370845'
+            '496064a9dd6214bd58f689dd817dbdc4d7f17d42a8c9940a87018c3f829ce308'
+            'f1d3a0dbfd82f7339301abecdbe5f024337919b48bd0e09296bb0e79863b2541')
+
+pkgver() {
+  cd gtk+
+  git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+  cd gtk+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd gtk+
+
+  CXX=/bin/false ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --disable-schemas-compile \
+    --enable-cloudproviders \
+    --enable-x11-backend \
+    --enable-broadway-backend \
+    --enable-wayland-backend \
+    --enable-gtk-doc
+
+  #https://bugzilla.gnome.org/show_bug.cgi?id=655517
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
+  make
+}
+
+package_gtk3() {
+  depends+=(gtk-update-icon-cache)
+  provides=(gtk3-print-backends)
+  conflicts=(gtk3-print-backends)
+  replaces=("gtk3-print-backends<=3.22.26-1")
+  install=gtk3.install
+
+  cd gtk+
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 ../settings.ini "$pkgdir/usr/share/gtk-3.0/settings.ini"
+  install -Dm644 ../gtk-query-immodules-3.0.hook "$pkgdir/usr/share/libalpm/hooks/gtk-query-immodules-3.0.hook"
+
+  # split this out to use with gtk2 too
+  rm "$pkgdir/usr/bin/gtk-update-icon-cache"
+}
+
+package_gtk-update-icon-cache() {
+  pkgdesc="GTK+ icon cache updater"
+  depends=(gdk-pixbuf2 hicolor-icon-theme)
+
+  cd gtk+
+  install -D gtk/gtk-update-icon-cache "$pkgdir/usr/bin/gtk-update-icon-cache"
+  install -Dm644 ../gtk-update-icon-cache.hook "$pkgdir/usr/share/libalpm/hooks/gtk-update-icon-cache.hook"
+  install -D ../gtk-update-icon-cache.script "$pkgdir/usr/share/libalpm/scripts/gtk-update-icon-cache"
+}
+
+# vim:set et sw=2:

Deleted: gtk-query-immodules-3.0.hook
===================================================================
--- gtk-query-immodules-3.0.hook	2017-11-26 15:34:20 UTC (rev 310955)
+++ gtk-query-immodules-3.0.hook	2017-11-26 15:35:03 UTC (rev 310956)
@@ -1,11 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
-
-[Action]
-Description = Probing GTK3 input method modules...
-When = PostTransaction
-Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache

Copied: gtk3/repos/extra-x86_64/gtk-query-immodules-3.0.hook (from rev 310955, gtk3/trunk/gtk-query-immodules-3.0.hook)
===================================================================
--- gtk-query-immodules-3.0.hook	                        (rev 0)
+++ gtk-query-immodules-3.0.hook	2017-11-26 15:35:03 UTC (rev 310956)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/lib/gtk-3.0/3.0.0/immodules/*.so
+
+[Action]
+Description = Probing GTK3 input method modules...
+When = PostTransaction
+Exec = /usr/bin/gtk-query-immodules-3.0 --update-cache

Deleted: gtk-update-icon-cache.hook
===================================================================
--- gtk-update-icon-cache.hook	2017-11-26 15:34:20 UTC (rev 310955)
+++ gtk-update-icon-cache.hook	2017-11-26 15:35:03 UTC (rev 310956)
@@ -1,13 +0,0 @@
-[Trigger]
-Type = File
-Operation = Install
-Operation = Upgrade
-Operation = Remove
-Target = usr/share/icons/*/
-Target = !usr/share/icons/*/?*
-
-[Action]
-Description = Updating icon theme caches...
-When = PostTransaction
-Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
-NeedsTargets

Copied: gtk3/repos/extra-x86_64/gtk-update-icon-cache.hook (from rev 310955, gtk3/trunk/gtk-update-icon-cache.hook)
===================================================================
--- gtk-update-icon-cache.hook	                        (rev 0)
+++ gtk-update-icon-cache.hook	2017-11-26 15:35:03 UTC (rev 310956)
@@ -0,0 +1,13 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/icons/*/
+Target = !usr/share/icons/*/?*
+
+[Action]
+Description = Updating icon theme caches...
+When = PostTransaction
+Exec = /usr/share/libalpm/scripts/gtk-update-icon-cache
+NeedsTargets

Deleted: gtk-update-icon-cache.script
===================================================================
--- gtk-update-icon-cache.script	2017-11-26 15:34:20 UTC (rev 310955)
+++ gtk-update-icon-cache.script	2017-11-26 15:35:03 UTC (rev 310956)
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-while read -r f; do
-  if [[ -e ${f}index.theme ]]; then
-    gtk-update-icon-cache -q "$f"
-  elif [[ -d $f ]]; then
-    rm -f "${f}icon-theme.cache"
-    rmdir --ignore-fail-on-non-empty "$f"
-  fi
-done

Copied: gtk3/repos/extra-x86_64/gtk-update-icon-cache.script (from rev 310955, gtk3/trunk/gtk-update-icon-cache.script)
===================================================================
--- gtk-update-icon-cache.script	                        (rev 0)
+++ gtk-update-icon-cache.script	2017-11-26 15:35:03 UTC (rev 310956)
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+while read -r f; do
+  if [[ -e ${f}index.theme ]]; then
+    gtk-update-icon-cache -q "$f"
+  elif [[ -d $f ]]; then
+    rm -f "${f}icon-theme.cache"
+    rmdir --ignore-fail-on-non-empty "$f"
+  fi
+done

Deleted: gtk3.install
===================================================================
--- gtk3.install	2017-11-26 15:34:20 UTC (rev 310955)
+++ gtk3.install	2017-11-26 15:35:03 UTC (rev 310956)
@@ -1,3 +0,0 @@
-pre_remove() {
-    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
-}

Copied: gtk3/repos/extra-x86_64/gtk3.install (from rev 310955, gtk3/trunk/gtk3.install)
===================================================================
--- gtk3.install	                        (rev 0)
+++ gtk3.install	2017-11-26 15:35:03 UTC (rev 310956)
@@ -0,0 +1,3 @@
+pre_remove() {
+    rm -f /usr/lib/gtk-3.0/3.0.0/immodules.cache
+}

Deleted: settings.ini
===================================================================
--- settings.ini	2017-11-26 15:34:20 UTC (rev 310955)
+++ settings.ini	2017-11-26 15:35:03 UTC (rev 310956)
@@ -1,4 +0,0 @@
-[Settings]
-gtk-icon-theme-name = Adwaita
-gtk-theme-name = Adwaita
-gtk-font-name = Cantarell 11

Copied: gtk3/repos/extra-x86_64/settings.ini (from rev 310955, gtk3/trunk/settings.ini)
===================================================================
--- settings.ini	                        (rev 0)
+++ settings.ini	2017-11-26 15:35:03 UTC (rev 310956)
@@ -0,0 +1,4 @@
+[Settings]
+gtk-icon-theme-name = Adwaita
+gtk-theme-name = Adwaita
+gtk-font-name = Cantarell 11


More information about the arch-commits mailing list