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

[Ronald van Haren]

    Date: Friday, January 31, 2014 @ 11:43:20
  Author: ronald
Revision: 105081

upgpkg: sakura 3.1.3-1

update to 3.1.3; remove upstream patch

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-31 10:03:46 UTC (rev 105080)
+++ PKGBUILD	2014-01-31 10:43:20 UTC (rev 105081)
@@ -3,7 +3,7 @@
 # Contributor: Dmitry N. Shilov <stormblast at land.ru>
 
 pkgname=sakura
-pkgver=3.1.2
+pkgver=3.1.3
 pkgrel=1
 pkgdesc="A terminal emulator based on GTK and VTE"
 arch=('i686' 'x86_64')
@@ -11,24 +11,19 @@
 license=('GPL')
 depends=('vte3' 'libxft' 'desktop-file-utils')
 makedepends=('cmake')
-source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2"
-	"deprecated_symbols.patch")
+source=("https://launchpad.net/sakura/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.bz2")
 install=sakura.install
-sha1sums=('c4d5356c228af112dda20b3db3eaf32868e91ab1'
-          '1c31086360f5ce9d6ca0e4303b6b8cf62266f4d1')
+sha1sums=('44556f30eb63c95eb46d253a0e69c81ec7e0112b')
 
 prepare() {
-  cd $srcdir/${pkgname}-${pkgver}
+  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
-
-  # deprecated gtk symbols are used but disabled... enabling
-  patch -Np1 -i ${srcdir}/deprecated_symbols.patch
 }
 
 build() {
-  cd $srcdir/${pkgname}-${pkgver}
+  cd "$srcdir/${pkgname}-${pkgver}"
 
   cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE . 
   make 
@@ -35,11 +30,11 @@
 }
 
 package() {
-  cd $srcdir/${pkgname}-${pkgver}
+  cd "$srcdir/${pkgname}-${pkgver}"
 
-  make DESTDIR=${pkgdir} install 
+  make DESTDIR="${pkgdir}" install 
   # extract the keybindings from the installed documentation, rest is only relevant during build time
   awk '/^Keybindings/{f="'${pkgdir}'/usr/share/doc/'${pkgname}'/KEYBINDINGS"} f{print > f} /^END/' \
-        ${pkgdir}/usr/share/doc/${pkgname}/INSTALL
-  rm ${pkgdir}/usr/share/doc/${pkgname}/INSTALL
+        "${pkgdir}"/usr/share/doc/${pkgname}/INSTALL
+  rm "${pkgdir}/usr/share/doc/${pkgname}/INSTALL"
 }

Deleted: deprecated_symbols.patch
===================================================================
--- deprecated_symbols.patch	2014-01-31 10:03:46 UTC (rev 105080)
+++ deprecated_symbols.patch	2014-01-31 10:43:20 UTC (rev 105081)
@@ -1,11 +0,0 @@
---- 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})