[arch-commits] Commit in conky/repos/extra-x86_64 (PKGBUILD PKGBUILD lua53.patch)

[Gaëtan Bisson]

    Date: Monday, December 3, 2018 @ 05:17:00
  Author: bisson
Revision: 340964

archrelease: copy trunk to extra-x86_64

Added:
  conky/repos/extra-x86_64/PKGBUILD
    (from rev 340963, conky/trunk/PKGBUILD)
Deleted:
  conky/repos/extra-x86_64/PKGBUILD
  conky/repos/extra-x86_64/lua53.patch

-------------+
 PKGBUILD    |  106 ++++++++++++++++++++++++++--------------------------------
 lua53.patch |   46 -------------------------
 2 files changed, 49 insertions(+), 103 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-03 05:16:43 UTC (rev 340963)
+++ PKGBUILD	2018-12-03 05:17:00 UTC (rev 340964)
@@ -1,57 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: James Rayner <james at archlinux.org>
-# Contributor: Partha Chowdhury <kira.laucas at gmail.com>
-
-pkgname=conky
-pkgver=1.10.8
-pkgrel=2
-pkgdesc='Lightweight system monitor for X'
-url='https://github.com/brndnmtthws/conky'
-license=('BSD' 'GPL')
-arch=('x86_64')
-makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git')
-depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft'
-         'imlib2' 'libxml2' 'libpulse')
-source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz"
-        'lua53.patch')
-sha256sums=('2ebd655a27c816bd613538b71d4ec1c096252cb522feaa05f64781dcedea8857'
-            '16516bdae848f85be949185746418fa5810d426e1f25b6dbbcefdbf4a0b8e6f3')
-
-options=('!strip' 'debug')
-
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../lua53.patch # lua_gettable returns an int in lua-5.3
-}
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	cmake \
-		-D CMAKE_BUILD_TYPE=Release \
-		-D MAINTAINER_MODE=ON \
-		-D BUILD_WLAN=ON \
-		-D BUILD_XDBE=ON \
-		-D BUILD_XSHAPE=ON \
-		-D BUILD_IMLIB2=ON \
-		-D BUILD_CURL=ON \
-		-D BUILD_RSS=ON \
-		-D BUILD_WEATHER_METAR=ON \
-		-D BUILD_WEATHER_XOAP=ON \
-		-D BUILD_PULSEAUDIO=ON \
-		-D BUILD_JOURNAL=ON \
-		-D CMAKE_INSTALL_PREFIX=/usr \
-		.
-
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
-	install -Dm644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
-}

Copied: conky/repos/extra-x86_64/PKGBUILD (from rev 340963, conky/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-12-03 05:17:00 UTC (rev 340964)
@@ -0,0 +1,49 @@
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: James Rayner <james at archlinux.org>
+# Contributor: Partha Chowdhury <kira.laucas at gmail.com>
+
+pkgname=conky
+pkgver=1.11.0
+pkgrel=1
+pkgdesc='Lightweight system monitor for X'
+url='https://github.com/brndnmtthws/conky'
+license=('BSD' 'GPL')
+arch=('x86_64')
+makedepends=('cmake' 'docbook2x' 'docbook-xsl' 'man-db' 'git')
+depends=('glib2' 'lua' 'wireless_tools' 'libxdamage' 'libxinerama' 'libxft'
+         'imlib2' 'libxml2' 'libpulse')
+source=("https://github.com/brndnmtthws/conky/archive/v${pkgver}.tar.gz")
+sha256sums=('cc75b5f6cdeefa83082f3dedf5a12105569c2cdc0ae3e7728922d79bc4abcf51')
+
+options=('!strip' 'debug')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	cmake \
+		-D CMAKE_BUILD_TYPE=Release \
+		-D MAINTAINER_MODE=ON \
+		-D BUILD_WLAN=ON \
+		-D BUILD_XDBE=ON \
+		-D BUILD_XSHAPE=ON \
+		-D BUILD_IMLIB2=ON \
+		-D BUILD_CURL=ON \
+		-D BUILD_RSS=ON \
+		-D BUILD_WEATHER_METAR=ON \
+		-D BUILD_WEATHER_XOAP=ON \
+		-D BUILD_PULSEAUDIO=ON \
+		-D BUILD_JOURNAL=ON \
+		-D CMAKE_INSTALL_PREFIX=/usr \
+		.
+
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	install -Dm644 extras/vim/syntax/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/syntax/conkyrc.vim
+	install -Dm644 extras/vim/ftdetect/conkyrc.vim "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/conkyrc.vim
+}

Deleted: lua53.patch
===================================================================
--- lua53.patch	2018-12-03 05:16:43 UTC (rev 340963)
+++ lua53.patch	2018-12-03 05:17:00 UTC (rev 340964)
@@ -1,46 +0,0 @@
-diff -aur old/src/luamm.cc new/src/luamm.cc
---- old/src/luamm.cc	2015-06-28 16:38:47.793615922 -1000
-+++ new/src/luamm.cc	2015-06-29 09:05:44.646667638 -1000
-@@ -165,7 +165,14 @@
- 		}
- 
- 		template<void (*misc)(lua_State *, int), int nresults>
--		int safe_misc_trampoline(lua_State *l)
-+		int safe_misc_trampoline_set(lua_State *l)
-+		{
-+			misc(l, 1);
-+			return nresults;
-+		}
-+
-+		template<int (*misc)(lua_State *, int), int nresults>
-+		int safe_misc_trampoline_get(lua_State *l)
- 		{
- 			misc(l, 1);
- 			return nresults;
-@@ -326,7 +333,7 @@
- 		if( rawequal(index1, index2) )
- 			return true;
- 
--		return safe_compare(&safe_compare_trampoline<lua_equal>, index1, index2);
-+		return safe_compare(&safe_compare_trampoline<&lua_equal>, index1, index2);
- 	}
- 
- 	int state::gc(int what, int data)
-@@ -367,7 +374,7 @@
- 		checkstack(2);
- 		pushvalue(index);
- 		insert(-2);
--		lua_pushcfunction(cobj.get(), (&safe_misc_trampoline<&lua_gettable, 1>));
-+		lua_pushcfunction(cobj.get(), (&safe_misc_trampoline_get<&lua_gettable, 1>));
- 		insert(-3);
- 		call(2, 1, 0);
- 	}
-@@ -492,7 +499,7 @@
- 		checkstack(2);
- 		pushvalue(index);
- 		insert(-3);
--		lua_pushcfunction(cobj.get(), (&safe_misc_trampoline<&lua_settable, 0>));
-+		lua_pushcfunction(cobj.get(), (&safe_misc_trampoline_set<&lua_settable, 0>));
- 		insert(-4);
- 		call(3, 0, 0);
- 	}