Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (768d6575750d808e7d9c05409cb469305cbb8e78)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (768d6575750d808e7d9c05409cb469305cbb8e78)
  • Date: Fri, 17 Aug 2018 06:21:25 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

crypto/keepassxc/DETAILS | 4 -
crypto/keepassxc/HISTORY | 3 +
devel/android-tools/0001-add-missing-includes.patch | 46
++++++++++++++++++++
devel/android-tools/HISTORY | 3 +
devel/android-tools/PRE_BUILD | 2
x11/xscreensaver/DETAILS | 4 -
x11/xscreensaver/HISTORY | 3 +
7 files changed, 61 insertions(+), 4 deletions(-)

New commits:
commit 768d6575750d808e7d9c05409cb469305cbb8e78
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

crypto/keepassxc: fix source url

commit 5e1c437cef01682bcf4acc7c346c021ba01fe29e
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11/xscreensaver: version 5.40

commit 60b7dc579e1377eb5ac32cf03d70496318d20f83
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/android-tools: fix error during linking

diff --git a/crypto/keepassxc/DETAILS b/crypto/keepassxc/DETAILS
index 2c65ed8..bf9a31b 100755
--- a/crypto/keepassxc/DETAILS
+++ b/crypto/keepassxc/DETAILS
@@ -1,7 +1,7 @@
SPELL=keepassxc
VERSION=2.3.3
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]=https://github.com/keepassxreboot/${SPELL}/archive/${VERSION}.tar.gz
+ SOURCE="${SPELL}-${VERSION}.tar.xz"
+
SOURCE_URL[0]=https://github.com/keepassxreboot/${SPELL}/releases/download/${VERSION}/keepassxc-${VERSION}-src.tar.xz

SOURCE_HASH=sha256:cfff85ef89ba590aec798c59bea4aa3db00626d7bff8cdde0f62ee34aea60ad5:UPSTREAM_HASH
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://keepassxc.org/";
diff --git a/crypto/keepassxc/HISTORY b/crypto/keepassxc/HISTORY
index 511528f..e18bf1a 100644
--- a/crypto/keepassxc/HISTORY
+++ b/crypto/keepassxc/HISTORY
@@ -1,3 +1,6 @@
+2018-08-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: fix source url
+
2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.3.3
* 0001-fix-build-with-gcc-8.patch, PRE_BUILD: fix build with gcc 8
diff --git a/devel/android-tools/0001-add-missing-includes.patch
b/devel/android-tools/0001-add-missing-includes.patch
new file mode 100644
index 0000000..0d1feaa
--- /dev/null
+++ b/devel/android-tools/0001-add-missing-includes.patch
@@ -0,0 +1,46 @@
+From 36b2fa39896e82da001125d4f447b739f3f3bbb2 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Wed, 15 Aug 2018 15:00:31 +0200
+Subject: [PATCH] add missing includes
+
+---
+ core-98d0789/adb/usb_linux.c | 1 +
+ core-98d0789/fastboot/usb_linux.c | 3 ++-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/core-98d0789/adb/usb_linux.c b/core-98d0789/adb/usb_linux.c
+index 7bf2057..7d8d6b5 100644
+--- a/core-98d0789/adb/usb_linux.c
++++ b/core-98d0789/adb/usb_linux.c
+@@ -22,6 +22,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
++#include <sys/sysmacros.h>
+ #include <dirent.h>
+ #include <fcntl.h>
+ #include <errno.h>
+diff --git a/core-98d0789/fastboot/usb_linux.c
b/core-98d0789/fastboot/usb_linux.c
+index b7a9ca3..39e7be1 100644
+--- a/core-98d0789/fastboot/usb_linux.c
++++ b/core-98d0789/fastboot/usb_linux.c
+@@ -34,6 +34,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <dirent.h>
+ #include <fcntl.h>
+ #include <errno.h>
+@@ -108,7 +109,7 @@ static int filter_usb_device(int fd, char *ptr, int len,
int writable,
+ int in, out;
+ unsigned i;
+ unsigned e;
+-
++
+ struct stat st;
+ int result;
+
+--
+2.18.0
+
diff --git a/devel/android-tools/HISTORY b/devel/android-tools/HISTORY
index 84053cc..6c3bb4c 100644
--- a/devel/android-tools/HISTORY
+++ b/devel/android-tools/HISTORY
@@ -1,3 +1,6 @@
+2018-08-15 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-add-missing-includes.patch: fix error during linking
+
2014-08-19 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: openssl => SSL

diff --git a/devel/android-tools/PRE_BUILD b/devel/android-tools/PRE_BUILD
index 99041b6..30e57d5 100755
--- a/devel/android-tools/PRE_BUILD
+++ b/devel/android-tools/PRE_BUILD
@@ -5,6 +5,8 @@ bsdtar xvf ${SOURCE_CACHE}/${SOURCE} &&
bsdtar xf core-${XHASH}.tar.xz &&
bsdtar xf extras-${XEXTRAS_HASH}.tar.xz &&

+patch -p1 < "$SPELL_DIRECTORY/0001-add-missing-includes.patch"
+
cd ${SOURCE_DIRECTORY}/core-${XHASH} &&

mv ../core-Makefile Makefile &&
diff --git a/x11/xscreensaver/DETAILS b/x11/xscreensaver/DETAILS
index f0511d1..92cdd9a 100755
--- a/x11/xscreensaver/DETAILS
+++ b/x11/xscreensaver/DETAILS
@@ -1,11 +1,11 @@
SPELL=xscreensaver
- VERSION=5.39
+ VERSION=5.40
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.jwz.org/$SPELL/$SOURCE
WEB_SITE=http://www.jwz.org/xscreensaver/
-
SOURCE_HASH=sha512:3f7aca6b428339c5d271d52deed469ee43370134d581a83e8f727dbe00e04a6c0f542952144f79447cba3f1f0c92ed7b1591e58255a4f94c0fc77342df19e0f7
+
SOURCE_HASH=sha512:e3b5fe03ee56596fd5b0bf4e805ec341906db9665d553a110b4e874e37406fbb596f7bd29da57871c59e8d90bcc97eba9ba92afd79c48139ac021eb9cf6af68d
ENTERED=20010922
LICENSE[0]=BSD
KEYWORDS="x11"
diff --git a/x11/xscreensaver/HISTORY b/x11/xscreensaver/HISTORY
index 4cb4fda..ae81215 100644
--- a/x11/xscreensaver/HISTORY
+++ b/x11/xscreensaver/HISTORY
@@ -1,3 +1,6 @@
+2018-08-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 5.40
+
2018-06-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 5.39
* DEPENDS: remove optional dependency on libxpm, add optional
dependency on



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (768d6575750d808e7d9c05409cb469305cbb8e78), Florian Franzmann, 08/17/2018

Archive powered by MHonArc 2.6.24.

Top of Page