[arch-commits] Commit in springlobby/repos/community-x86_64 (4 files)

[Sven-Hendrik Haase]

    Date: Thursday, January 2, 2020 @ 10:50:25
  Author: svenstaro
Revision: 546032

archrelease: copy trunk to community-x86_64

Added:
  springlobby/repos/community-x86_64/PKGBUILD
    (from rev 546031, springlobby/trunk/PKGBUILD)
  springlobby/repos/community-x86_64/springlobby-wxgtk-3.1.patch
    (from rev 546031, springlobby/trunk/springlobby-wxgtk-3.1.patch)
Deleted:
  springlobby/repos/community-x86_64/PKGBUILD
  springlobby/repos/community-x86_64/springlobby-wxgtk-3.1.patch

-----------------------------+
 PKGBUILD                    |   88 ++++++++++++++++++++++--------------------
 springlobby-wxgtk-3.1.patch |   22 +++++-----
 2 files changed, 59 insertions(+), 51 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-02 10:43:18 UTC (rev 546031)
+++ PKGBUILD	2020-01-02 10:50:25 UTC (rev 546032)
@@ -1,40 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: DuGi <dugi at irc.pl>
-
-pkgname=springlobby
-pkgver=0.267
-pkgrel=5
-pkgdesc="A free cross-platform lobby client for the Spring RTS project"
-arch=('x86_64')
-url="http://springlobby.info/"
-license=('GPL2')
-depends=('hicolor-icon-theme' 'wxgtk3' 'curl' 'libtorrent-rasterbar' 'boost-libs'
-         'alure' 'libsm')
-optdepends=('sdl' 'sdl_sound' 'sdl_mixer')
-makedepends=('boost' 'cmake')
-source=(https://springlobby.info/tarballs/springlobby-${pkgver}.tar.bz2
-        springlobby-wxgtk-3.1.patch)
-sha512sums=('6127bd7377f9a843b23df6dae7a07af1122f6ec5fa13cd8d16c0c7a3cc84e1f7af2fb7df929f904ee0b4e3abf12ae1e525ffb39b2afa0215433209054cf0de5f'
-            'bf70703c5f001bfc92699d4c21e6ca63b35994319f1096e50b07dba4ceb48cd7d67798fa1668c3c654b0372465a5ad383d9cbae9488f08dea6d78dee8901d418')
-
-prepare() {
-  cd $pkgname-$pkgver
-  patch -p1 -i ../springlobby-wxgtk-3.1.patch # Fix build with wxgtk 3.1
-}
-
-build() {
-  cd $srcdir/${pkgname}-${pkgver}
-
-  cmake . \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
-  make
-}
-
-package() {
-  cd $srcdir/${pkgname}-${pkgver}
-
-  make DESTDIR=$pkgdir install
-}
-
-# vim: sw=2:ts=2 et:

Copied: springlobby/repos/community-x86_64/PKGBUILD (from rev 546031, springlobby/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-01-02 10:50:25 UTC (rev 546032)
@@ -0,0 +1,48 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Contributor: DuGi <dugi at irc.pl>
+
+pkgname=springlobby
+pkgver=0.269
+pkgrel=1
+pkgdesc="A free cross-platform lobby client for the Spring RTS project"
+arch=('x86_64')
+url="http://springlobby.info/"
+license=('GPL2')
+depends=('hicolor-icon-theme' 'wxgtk3' 'curl' 'libtorrent-rasterbar' 'boost-libs'
+         'alure' 'libsm')
+optdepends=('sdl' 'sdl_sound' 'sdl_mixer')
+makedepends=('boost' 'cmake' 'git')
+source=("git+https://github.com/springlobby/springlobby.git#tag=$pkgver"
+        "git+https://github.com/spring/pr-downloader.git"
+        "springlobby-wxgtk-3.1.patch")
+sha512sums=('SKIP'
+            'SKIP'
+            'bf70703c5f001bfc92699d4c21e6ca63b35994319f1096e50b07dba4ceb48cd7d67798fa1668c3c654b0372465a5ad383d9cbae9488f08dea6d78dee8901d418')
+
+prepare() {
+  cd $pkgname
+  patch -p1 -i ../springlobby-wxgtk-3.1.patch # Fix build with wxgtk 3.1
+
+  git submodule init
+  git config submodule."src/downloader/lib".url "$srcdir"/pr-downloader
+  git submodule update
+
+  mkdir build
+}
+
+build() {
+  cd $pkgname/build
+
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+  make
+}
+
+package() {
+  cd $pkgname/build
+
+  DESTDIR="$pkgdir" make install
+}
+
+# vim: sw=2:ts=2 et:

Deleted: springlobby-wxgtk-3.1.patch
===================================================================
--- springlobby-wxgtk-3.1.patch	2020-01-02 10:43:18 UTC (rev 546031)
+++ springlobby-wxgtk-3.1.patch	2020-01-02 10:50:25 UTC (rev 546032)
@@ -1,11 +0,0 @@
---- springlobby-0.267/src/springsettings/tab_abstract.cpp.orig	2019-03-26 07:45:27.981903360 +0000
-+++ springlobby-0.267/src/springsettings/tab_abstract.cpp	2019-03-26 07:45:42.628735154 +0000
-@@ -95,7 +95,7 @@
- {
- 	try {
- 		//special treatment for resolution that'll set proper defaults for res
--		wxDisplay display(0);
-+		wxDisplay display(0U);
- 		//		wxRect display_rect ( display.GetGeometry() );
- 		//		const int current_x_res = LSL::susynclib().GetSpringConfigInt(RC_TEXT[0].key,display_rect.width);
- 		//		const int current_y_res = LSL::susynclib().GetSpringConfigInt(RC_TEXT[1].key,display_rect.height);

Copied: springlobby/repos/community-x86_64/springlobby-wxgtk-3.1.patch (from rev 546031, springlobby/trunk/springlobby-wxgtk-3.1.patch)
===================================================================
--- springlobby-wxgtk-3.1.patch	                        (rev 0)
+++ springlobby-wxgtk-3.1.patch	2020-01-02 10:50:25 UTC (rev 546032)
@@ -0,0 +1,11 @@
+--- springlobby-0.267/src/springsettings/tab_abstract.cpp.orig	2019-03-26 07:45:27.981903360 +0000
++++ springlobby-0.267/src/springsettings/tab_abstract.cpp	2019-03-26 07:45:42.628735154 +0000
+@@ -95,7 +95,7 @@
+ {
+ 	try {
+ 		//special treatment for resolution that'll set proper defaults for res
+-		wxDisplay display(0);
++		wxDisplay display(0U);
+ 		//		wxRect display_rect ( display.GetGeometry() );
+ 		//		const int current_x_res = LSL::susynclib().GetSpringConfigInt(RC_TEXT[0].key,display_rect.width);
+ 		//		const int current_y_res = LSL::susynclib().GetSpringConfigInt(RC_TEXT[1].key,display_rect.height);