From 219ca3c6246c89fd45ccc2da7618f63a96006898 Mon Sep 17 00:00:00 2001 From: Yiyang Kang Date: Wed, 3 Mar 2021 15:28:15 +0800 Subject: [PATCH] fix build with vala 0.50 --- .SRCINFO | 10 ++-- .gitignore | 1 + PKGBUILD | 21 ++++++-- fix-build.patch | 136 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 159 insertions(+), 9 deletions(-) create mode 100644 fix-build.patch diff --git a/.SRCINFO b/.SRCINFO index eacbfbb..8dfb96e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ pkgbase = indicator-kdeconnect-git pkgdesc = Integrate KDEConnect on desktop environments that use AppIndicators (e.g. Unity) - pkgver = r599.070ebaa - pkgrel = 2 - url = https://github.com/bajoja/indicator-kdeconnect + pkgver = r625.669bdd5 + pkgrel = 1 + url = https://github.com/b4j4/indicator-kdeconnect arch = any license = GPL makedepends = git @@ -17,7 +17,9 @@ pkgbase = indicator-kdeconnect-git provides = indicator-kdeconnect conflicts = indicator-kdeconnect source = git+https://github.com/bajoja/indicator-kdeconnect.git - md5sums = SKIP + source = fix-build.patch + sha256sums = SKIP + sha256sums = b79c5b3b3cda6b7e9e329ae1ea080f8750dde64025090b9cb534efb7a2c0f537 pkgname = indicator-kdeconnect-git diff --git a/.gitignore b/.gitignore index 4dab8d6..8e90664 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ !.gitignore !PKGBUILD !.SRCINFO +!*.patch diff --git a/PKGBUILD b/PKGBUILD index 0006188..d548864 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,25 +2,36 @@ # Contributor: shimi # Contributor: Gustavo Castro pkgname=indicator-kdeconnect-git -pkgver=r599.070ebaa -pkgrel=2 +pkgver=r625.669bdd5 +pkgrel=1 _gitname=indicator-kdeconnect pkgdesc="Integrate KDEConnect on desktop environments that use AppIndicators (e.g. Unity)" arch=('any') -url="https://github.com/bajoja/indicator-kdeconnect" +url="https://github.com/b4j4/indicator-kdeconnect" license=('GPL') conflicts=('indicator-kdeconnect') provides=('indicator-kdeconnect') depends=('libappindicator-gtk3' 'kdeconnect' 'vala' 'python-requests-oauthlib' 'python-gobject' 'libgee') makedepends=('git' 'meson' 'ninja') -source=('git+https://github.com/bajoja/indicator-kdeconnect.git') -md5sums=('SKIP') +source=( + 'git+https://github.com/bajoja/indicator-kdeconnect.git' + 'fix-build.patch' +) +sha256sums=( + 'SKIP' + 'b79c5b3b3cda6b7e9e329ae1ea080f8750dde64025090b9cb534efb7a2c0f537' +) pkgver() { cd $_gitname printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } +prepare() { + cd "$_gitname" + patch --forward --strip=1 --input="${srcdir}/fix-build.patch" +} + build() { mkdir build && cd build meson ../$_gitname --prefix=/usr --libdir=/usr/lib diff --git a/fix-build.patch b/fix-build.patch new file mode 100644 index 0000000..acc6ff9 --- /dev/null +++ b/fix-build.patch @@ -0,0 +1,136 @@ +diff --git a/src/common/iBatteryPlugin.vala b/src/common/iBatteryPlugin.vala +index a4b3502..5514cc3 100644 +--- a/src/common/iBatteryPlugin.vala ++++ b/src/common/iBatteryPlugin.vala +@@ -76,7 +76,7 @@ namespace IndicatorKDEConnect { + } + + protected void int32_signal_cb (DBusConnection con, +- string sender, ++ string? sender, + string object, + string interface, + string signal_name, +@@ -87,7 +87,7 @@ namespace IndicatorKDEConnect { + } + + protected void boolean_signal_cb (DBusConnection con, +- string sender, ++ string? sender, + string object, + string interface, + string signal_name, +diff --git a/src/common/iDaemonPlugin.vala b/src/common/iDaemonPlugin.vala +index 8653729..201da90 100644 +--- a/src/common/iDaemonPlugin.vala ++++ b/src/common/iDaemonPlugin.vala +@@ -114,7 +114,7 @@ namespace IndicatorKDEConnect { + /*Signals Callbacks*/ + + protected virtual void device_added_cb (DBusConnection con, +- string sender, ++ string? sender, + string object, + string interface, + string signal_name, +@@ -128,7 +128,7 @@ namespace IndicatorKDEConnect { + } + + protected virtual void device_removed_cb (DBusConnection con, +- string sender, ++ string? sender, + string object, + string interface, + string signal_name, +@@ -142,7 +142,7 @@ namespace IndicatorKDEConnect { + } + + protected virtual void device_visibility_changed_cb (DBusConnection con, +- string sender, ++ string? sender, + string object, + string interface, + string signal_name, +@@ -157,7 +157,7 @@ namespace IndicatorKDEConnect { + } + + protected virtual void pairing_requests_changed_cb (DBusConnection con, +- string sender, ++ string? sender, + string object, + string interface, + string signal_name, +diff --git a/src/common/iDevicePlugin.vala b/src/common/iDevicePlugin.vala +index 8570775..bad3eac 100644 +--- a/src/common/iDevicePlugin.vala ++++ b/src/common/iDevicePlugin.vala +@@ -237,7 +237,7 @@ namespace IndicatorKDEConnect { + + /*Callbacks */ + protected void void_signal_cb (DBusConnection con, +- string sender, ++ string? sender, + string object, + string interface, + string signal_name, +@@ -253,7 +253,7 @@ namespace IndicatorKDEConnect { + } + + protected void string_signal_cb (DBusConnection con, +- string sender, ++ string? sender, + string object, + string interface, + string signal_name, +@@ -273,7 +273,7 @@ namespace IndicatorKDEConnect { + } + + protected void boolean_signal_cb (DBusConnection con, +- string sender, ++ string? sender, + string object, + string interface, + string signal_name, +diff --git a/src/common/iSignals.vala b/src/common/iSignals.vala +index 52c2b82..1eb390b 100644 +--- a/src/common/iSignals.vala ++++ b/src/common/iSignals.vala +@@ -6,7 +6,7 @@ + namespace IndicatorKDEConnect { + public interface ISignals : Object { + public virtual void void_signal_cb (DBusConnection con, +- string sender, ++ string? sender, + string object, + string interface, + string signal_name, +@@ -16,7 +16,7 @@ namespace IndicatorKDEConnect { + } + + public virtual void boolean_signal_cb (DBusConnection con, +- string sender, ++ string? sender, + string object, + string interface, + string signal_name, +@@ -26,7 +26,7 @@ namespace IndicatorKDEConnect { + } + + public virtual void string_signal_cb (DBusConnection con, +- string sender, ++ string? sender, + string object, + string interface, + string signal_name, +@@ -36,7 +36,7 @@ namespace IndicatorKDEConnect { + } + + public virtual void int32_signal_cb (DBusConnection con, +- string sender, ++ string? sender, + string object, + string interface, + string signal_name, +-- +2.30.1 +