fix build with vala 0.50
This commit is contained in:
parent
5b2b8463aa
commit
219ca3c624
10
.SRCINFO
10
.SRCINFO
|
@ -1,8 +1,8 @@
|
||||||
pkgbase = indicator-kdeconnect-git
|
pkgbase = indicator-kdeconnect-git
|
||||||
pkgdesc = Integrate KDEConnect on desktop environments that use AppIndicators (e.g. Unity)
|
pkgdesc = Integrate KDEConnect on desktop environments that use AppIndicators (e.g. Unity)
|
||||||
pkgver = r599.070ebaa
|
pkgver = r625.669bdd5
|
||||||
pkgrel = 2
|
pkgrel = 1
|
||||||
url = https://github.com/bajoja/indicator-kdeconnect
|
url = https://github.com/b4j4/indicator-kdeconnect
|
||||||
arch = any
|
arch = any
|
||||||
license = GPL
|
license = GPL
|
||||||
makedepends = git
|
makedepends = git
|
||||||
|
@ -17,7 +17,9 @@ pkgbase = indicator-kdeconnect-git
|
||||||
provides = indicator-kdeconnect
|
provides = indicator-kdeconnect
|
||||||
conflicts = indicator-kdeconnect
|
conflicts = indicator-kdeconnect
|
||||||
source = git+https://github.com/bajoja/indicator-kdeconnect.git
|
source = git+https://github.com/bajoja/indicator-kdeconnect.git
|
||||||
md5sums = SKIP
|
source = fix-build.patch
|
||||||
|
sha256sums = SKIP
|
||||||
|
sha256sums = b79c5b3b3cda6b7e9e329ae1ea080f8750dde64025090b9cb534efb7a2c0f537
|
||||||
|
|
||||||
pkgname = indicator-kdeconnect-git
|
pkgname = indicator-kdeconnect-git
|
||||||
|
|
||||||
|
|
|
@ -5,3 +5,4 @@
|
||||||
!.gitignore
|
!.gitignore
|
||||||
!PKGBUILD
|
!PKGBUILD
|
||||||
!.SRCINFO
|
!.SRCINFO
|
||||||
|
!*.patch
|
||||||
|
|
21
PKGBUILD
21
PKGBUILD
|
@ -2,25 +2,36 @@
|
||||||
# Contributor: shimi <shimi.chen@gmail.com>
|
# Contributor: shimi <shimi.chen@gmail.com>
|
||||||
# Contributor: Gustavo Castro <gustawho at gmail dot com>
|
# Contributor: Gustavo Castro <gustawho at gmail dot com>
|
||||||
pkgname=indicator-kdeconnect-git
|
pkgname=indicator-kdeconnect-git
|
||||||
pkgver=r599.070ebaa
|
pkgver=r625.669bdd5
|
||||||
pkgrel=2
|
pkgrel=1
|
||||||
_gitname=indicator-kdeconnect
|
_gitname=indicator-kdeconnect
|
||||||
pkgdesc="Integrate KDEConnect on desktop environments that use AppIndicators (e.g. Unity)"
|
pkgdesc="Integrate KDEConnect on desktop environments that use AppIndicators (e.g. Unity)"
|
||||||
arch=('any')
|
arch=('any')
|
||||||
url="https://github.com/bajoja/indicator-kdeconnect"
|
url="https://github.com/b4j4/indicator-kdeconnect"
|
||||||
license=('GPL')
|
license=('GPL')
|
||||||
conflicts=('indicator-kdeconnect')
|
conflicts=('indicator-kdeconnect')
|
||||||
provides=('indicator-kdeconnect')
|
provides=('indicator-kdeconnect')
|
||||||
depends=('libappindicator-gtk3' 'kdeconnect' 'vala' 'python-requests-oauthlib' 'python-gobject' 'libgee')
|
depends=('libappindicator-gtk3' 'kdeconnect' 'vala' 'python-requests-oauthlib' 'python-gobject' 'libgee')
|
||||||
makedepends=('git' 'meson' 'ninja')
|
makedepends=('git' 'meson' 'ninja')
|
||||||
source=('git+https://github.com/bajoja/indicator-kdeconnect.git')
|
source=(
|
||||||
md5sums=('SKIP')
|
'git+https://github.com/bajoja/indicator-kdeconnect.git'
|
||||||
|
'fix-build.patch'
|
||||||
|
)
|
||||||
|
sha256sums=(
|
||||||
|
'SKIP'
|
||||||
|
'b79c5b3b3cda6b7e9e329ae1ea080f8750dde64025090b9cb534efb7a2c0f537'
|
||||||
|
)
|
||||||
|
|
||||||
pkgver() {
|
pkgver() {
|
||||||
cd $_gitname
|
cd $_gitname
|
||||||
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
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() {
|
build() {
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
meson ../$_gitname --prefix=/usr --libdir=/usr/lib
|
meson ../$_gitname --prefix=/usr --libdir=/usr/lib
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue