Date: Saturday, January 9, 2016 @ 15:19:57 Author: arojas Revision: 155789
libical 2.0 rebuild, add Fedora patch to fix build with GCC 5 Added: gnokii/trunk/gnokii-gcc5.patch Modified: gnokii/trunk/PKGBUILD -------------------+ PKGBUILD | 9 +++++++-- gnokii-gcc5.patch | 27 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-01-09 14:10:15 UTC (rev 155788) +++ PKGBUILD 2016-01-09 14:19:57 UTC (rev 155789) @@ -21,10 +21,12 @@ install=$pkgname.install source=("http://www.gnokii.org/download/$pkgname/$pkgname-$pkgver.tar.bz2" 'gnokii-config.patch' - 'gnokii-lock.patch') + 'gnokii-lock.patch' + 'gnokii-gcc5.patch') md5sums=('d9627f4a1152d3ea7806df4532850d5f' 'b2961b52ac1f770c4704ccc50b64fde2' - '17b629db85a6bb2b98ca59941aa95295') + '17b629db85a6bb2b98ca59941aa95295' + '5bcf2dadd31a826d1f80b53bb37d9bd0') prepare() { cd $pkgname-$pkgver @@ -34,6 +36,9 @@ # Set lock path patch -Np1 -i "$srcdir/gnokii-lock.patch" + + # Fix build with GCC 5 (Fedora patch) + patch -Np1 -i "$srcdir/gnokii-gcc5.patch" } build() { Added: gnokii-gcc5.patch =================================================================== --- gnokii-gcc5.patch (rev 0) +++ gnokii-gcc5.patch 2016-01-09 14:19:57 UTC (rev 155789) @@ -0,0 +1,27 @@ +Patch by Robert Scheck <rob...@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); + }