[arch-commits] Commit in sakura/trunk (PKGBUILD deprecated_symbols.patch)

[Ronald van Haren]

    Date: Tuesday, December 10, 2013 @ 21:25:47
  Author: ronald
Revision: 102424

upgpkg: sakura 3.1.2-1

update to 3.1.2; enable deprecated gtk symbols

Added:
  sakura/trunk/deprecated_symbols.patch
Modified:
  sakura/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   21 ++++++++++++++-------
 deprecated_symbols.patch |   11 +++++++++++
 2 files changed, 25 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-10 18:39:12 UTC (rev 102423)
+++ PKGBUILD	2013-12-10 20:25:47 UTC (rev 102424)
@@ -3,7 +3,7 @@
 # Contributor: Dmitry N. Shilov <stormblast at land.ru>
 
 pkgname=sakura
-pkgver=3.1.0
+pkgver=3.1.2
 pkgrel=1
 pkgdesc="A terminal emulator based on GTK and VTE"
 arch=('i686' 'x86_64')
@@ -11,17 +11,25 @@
 license=('GPL')
 depends=('vte3' 'libxft' 'desktop-file-utils')
 makedepends=('cmake')
-source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
+source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2"
+	"deprecated_symbols.patch")
 install=sakura.install
-sha1sums=('159abc2f83e912da1bfb35c9b239b092e78a044f')
+sha1sums=('c4d5356c228af112dda20b3db3eaf32868e91ab1'
+          '1c31086360f5ce9d6ca0e4303b6b8cf62266f4d1')
 
-build() {
+prepare() {
   cd $srcdir/${pkgname}-${pkgver}
 
   # Set default font size a bit smaller
   sed -i 's|#define DEFAULT_FONT "Bitstream Vera Sans Mono 14"|#define DEFAULT_FONT "Bitstream Vera Sans Mono 10"|g' src/sakura.c
- 
-  # build & install	
+
+  # deprecated gtk symbols are used but disabled... enabling
+  patch -Np1 -i ${srcdir}/deprecated_symbols.patch
+}
+
+build() {
+  cd $srcdir/${pkgname}-${pkgver}
+
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE . 
   make 
 }
@@ -35,4 +43,3 @@
         ${pkgdir}/usr/share/doc/${pkgname}/INSTALL
   rm ${pkgdir}/usr/share/doc/${pkgname}/INSTALL
 }
-

Added: deprecated_symbols.patch
===================================================================
--- deprecated_symbols.patch	                        (rev 0)
+++ deprecated_symbols.patch	2013-12-10 20:25:47 UTC (rev 102424)
@@ -0,0 +1,11 @@
+--- sakura-3.1.2/CMakeLists.txt.bak	2013-12-10 21:02:16.853828972 +0100
++++ sakura-3.1.2/CMakeLists.txt	2013-12-10 21:02:45.473679293 +0100
+@@ -38,7 +38,7 @@
+ IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+ 	SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+ ELSE (${CMAKE_BUILD_TYPE} NOT MATCHES "Debug")
+-	SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-deprecated-declarations -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED")
++	SET (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -Wno-deprecated-declarations")
+ ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+ 
+ INCLUDE_DIRECTORIES (. ${GTK_INCLUDE_DIRS} ${VTE_INCLUDE_DIRS})