Commit 644c6d6e authored by Natanael Copa's avatar Natanael Copa

main/gnokii: fix build with gcc 5

parent b5b9d171
......@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gnokii
pkgver=0.6.31
pkgrel=4
pkgrel=5
pkgdesc="Tools and user space driver for use with mobile phones"
url="http://www.gnokii.org/"
arch="all"
......@@ -17,7 +17,9 @@ makedepends="gtk+-dev mariadb-dev intltool libusb-compat-dev libxpm-dev
autoconf automake libtool"
source="http://www.gnokii.org/download/gnokii/gnokii-$pkgver.tar.bz2
gnokii.patch
xgnokii.patch"
xgnokii.patch
gnokii-0.6.31-gcc5.patch
"
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
......@@ -93,4 +95,13 @@ sqlite() {
}
md5sums="d9627f4a1152d3ea7806df4532850d5f gnokii-0.6.31.tar.bz2
5de7a1c6a59b740df9d24f5c08cea448 gnokii.patch
6b87d13cb012bfdfd3581d89f42a3cff xgnokii.patch"
6b87d13cb012bfdfd3581d89f42a3cff xgnokii.patch
5bcf2dadd31a826d1f80b53bb37d9bd0 gnokii-0.6.31-gcc5.patch"
sha256sums="8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501 gnokii-0.6.31.tar.bz2
4bde95dd970c314e2243f3deea9047665802fa09bc5b97ebfa9b5b6c2844af7b gnokii.patch
08a2df9d843de490969adf44a6a8871f55aa2ad784c24d9cd44894fb203f7770 xgnokii.patch
eafe67990e383e92636a88de27f003674374db81d986ddbb397ab18d82b6556d gnokii-0.6.31-gcc5.patch"
sha512sums="529f6d0d29873f48ac00cf7151ba35dcbd93405ab27d69848ed17dea73f4fba71721d1811d921441b4214777b9b33f760b372631627cc108eb94c39684da343d gnokii-0.6.31.tar.bz2
a253cd0a461b06b3d11202f36c518f6364705008c36d4e7ecd292ecd2e4288e42fbd55110405c6bb2d2d82499e047876aa92a9292b629d1323189a9164359d32 gnokii.patch
b7033907d8bca55366b09ef976e1f1e48a31ef2630e55770200fc3818c1a36aa6478bc73cb4f180b469d21157ad5af389dc075280f22251b7402d7ab584f37dc xgnokii.patch
548a32f93b059e45c8616dedf49a0ce3b0e63463f8ddc3384b473d91bd12c3fab2c6e21de0b09d2b330c189454a2bf3e486aa25122ea58392d9cb11994592086 gnokii-0.6.31-gcc5.patch"
Patch by Robert Scheck <robert@fedoraproject.org> for gnokii <= 0.6.31 to avoid
build failures with GCC 5.x as "gnokii-0.6.31/xgnokii/xgnokii.c:1209: undefined
reference to `GUI_HideAbout'" and "xgnokii-xgnokii_logos.o:(.data.rel+0xe0):
undefined reference to `CloseLogosWindow'".
--- gnokii-0.6.31/xgnokii/xgnokii.c 2011-12-02 15:53:04.000000000 +0100
+++ gnokii-0.6.31/xgnokii/xgnokii.c.gcc5 2015-06-20 15:49:59.000000000 +0200
@@ -798,7 +798,7 @@
}
-inline void GUI_HideAbout(void)
+void GUI_HideAbout(void)
{
gtk_widget_hide(AboutDialog);
}
--- gnokii-0.6.31/xgnokii/xgnokii_logos.c 2011-12-02 15:53:04.000000000 +0100
+++ gnokii-0.6.31/xgnokii/xgnokii_logos.c.gcc5 2015-06-20 15:50:15.000000000 +0200
@@ -1304,7 +1304,7 @@
return 0;
}
-inline void CloseLogosWindow(void)
+void CloseLogosWindow(void)
{
gtk_widget_hide(GUI_LogosWindow);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment