[arch-commits] Commit in at-spi2-core/trunk (2 files)

[Jan Steffens]

    Date: Monday, October 30, 2017 @ 18:48:23
  Author: heftig
Revision: 308680

2.26.1-1

Modified:
  at-spi2-core/trunk/PKGBUILD
Deleted:
  at-spi2-core/trunk/0001-meson-Actually-use-the-soversion.patch

---------------------------------------------+
 0001-meson-Actually-use-the-soversion.patch |   26 --------------------------
 PKGBUILD                                    |   11 ++++-------
 2 files changed, 4 insertions(+), 33 deletions(-)

Deleted: 0001-meson-Actually-use-the-soversion.patch
===================================================================
--- 0001-meson-Actually-use-the-soversion.patch	2017-10-30 18:31:39 UTC (rev 308679)
+++ 0001-meson-Actually-use-the-soversion.patch	2017-10-30 18:48:23 UTC (rev 308680)
@@ -1,26 +0,0 @@
-From 7b62f2cb1e363ac4a0c907856c983b195997ccd2 Mon Sep 17 00:00:00 2001
-Message-Id: <7b62f2cb1e363ac4a0c907856c983b195997ccd2.1505028215.git.jan.steffens at gmail.com>
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Sun, 10 Sep 2017 09:23:13 +0200
-Subject: [PATCH] meson: Actually use the soversion
-
----
- atspi/meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/atspi/meson.build b/atspi/meson.build
-index 1ec3ecd63e6b5fac..5aeba49ba9c27079 100644
---- a/atspi/meson.build
-+++ b/atspi/meson.build
-@@ -68,6 +68,8 @@ atspi_enums = gnome.mkenums('atspi-enum-types',
- atspi_enum_h = atspi_enums[1]
- 
- atspi = shared_library('atspi', atspi_sources + atspi_enums,
-+                       version: soversion.split('.')[0],
-+                       soversion: soversion,
-                        include_directories: [ root_inc, registryd_inc ],
-                        dependencies: [ libdbus_dep, gobject_dep, dbind_dep ],
-                        install: true)
--- 
-2.14.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-30 18:31:39 UTC (rev 308679)
+++ PKGBUILD	2017-10-30 18:48:23 UTC (rev 308680)
@@ -2,7 +2,7 @@
 # Contributor: Ionut Biru <ibiru at archlinux.org>
 
 pkgname=at-spi2-core
-pkgver=2.26.0+4+g7070583
+pkgver=2.26.1
 pkgrel=1
 pkgdesc="Protocol definitions and daemon for D-Bus at-spi"
 url="https://git.gnome.org/browse/at-spi2-core"
@@ -10,11 +10,9 @@
 license=(GPL2)
 depends=(dbus glib2 libxtst)
 makedepends=(intltool gobject-introspection git gtk-doc meson)
-_commit=70705839990f8eb5112b0262bb0960e806c62fbc  # master
-source=("git+https://git.gnome.org/browse/at-spi2-core#commit=$_commit"
-        0001-meson-Actually-use-the-soversion.patch)
-sha256sums=('SKIP'
-            '36f67a3a20bdb63f3ee2199634962a7e93f323d481f8da5801f3ad2a533a9d8e')
+_commit=832febae6759636ce7abf98a93738d60a9726a3b  # tags/AT_SPI2_CORE_2_26_1^0
+source=("git+https://git.gnome.org/browse/at-spi2-core#commit=$_commit")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $pkgname
@@ -24,7 +22,6 @@
 prepare() {
   mkdir build
   cd $pkgname
-  git apply -3 ../0001-meson-Actually-use-the-soversion.patch
 }
   
 build() {