Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Florian Franzmann (18f7df52b72816a586235bf05b06ec588edef221)

Chronological Thread  
    < 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 (18f7df52b72816a586235bf05b06ec588edef221)
  • Date: Mon, 6 Aug 2018 18:11:17 +0000
GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

archive/sharutils/HISTORY
| 4
archive/sharutils/PRE_BUILD
| 5

archive/sharutils/sharutils-4.15.2-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
| 178 ++++++++++
disk/lilo/DEPENDS
| 2
disk/lilo/HISTORY
| 3
disk/mdadm/DETAILS
| 4
disk/mdadm/HISTORY
| 3
haskell/haskell-x11/DEPENDS
| 7
haskell/haskell-x11/HISTORY
| 3
http/newsboat/DEPENDS
| 1
http/newsboat/HISTORY
| 3
net/crda/DEPENDS
| 7
net/crda/HISTORY
| 3
net/net-tools/DEPENDS
| 1
net/net-tools/HISTORY
| 3
qt5/qtbase/HISTORY
| 3
qt5/qtbase/patches/qt5-qtbase-glibc.patch
| 53 ++
video-libs/x264/DEPENDS
| 2
video-libs/x264/HISTORY
| 3
x11/conky/DEPENDS
| 8
x11/conky/HISTORY
| 3
21 files changed, 284 insertions(+), 15 deletions(-)

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

qt5/qtbase: fix breakage caused by glibc 2.28

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

x11/conky: make LUA dependency mandatory, depend on libmicrohttpd

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

http/newsboat: add dependency on json-c

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

archive/sharutils: fix breakage caused by glibc 2.28

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

disk/lilo: depend on sharutils instead of UUDECODE

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

disk/mdadm: version 4.0

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

video-libs/x264: depend on nasm instead of yasm

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

net/crda: add dependency on gcrypt

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

haskell/haskell-x11: add dependency on libxscrnsaver

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

net/net-tools: add dependency on unzip

diff --git a/archive/sharutils/HISTORY b/archive/sharutils/HISTORY
index eaecf82..74f3375 100644
--- a/archive/sharutils/HISTORY
+++ b/archive/sharutils/HISTORY
@@ -1,3 +1,7 @@
+2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD,
sharutils-4.15.2-fflush-adjust-to-glibc-2.28-libio.h-removal.patch:
+ fix breakage caused by glibc 2.28
+
2016-08-11 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 4.15.2

diff --git a/archive/sharutils/PRE_BUILD b/archive/sharutils/PRE_BUILD
new file mode 100755
index 0000000..7c651e7
--- /dev/null
+++ b/archive/sharutils/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 <
"$SPELL_DIRECTORY/sharutils-4.15.2-fflush-adjust-to-glibc-2.28-libio.h-removal.patch"
+
diff --git
a/archive/sharutils/sharutils-4.15.2-fflush-adjust-to-glibc-2.28-libio.h-removal.patch

b/archive/sharutils/sharutils-4.15.2-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
new file mode 100644
index 0000000..78e6564
--- /dev/null
+++
b/archive/sharutils/sharutils-4.15.2-fflush-adjust-to-glibc-2.28-libio.h-removal.patch
@@ -0,0 +1,178 @@
+From 0e2f412eeec2e1f7f5743ea23c62bdf98bf4102c Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert AT cs.ucla.edu>
+Date: Thu, 8 Mar 2018 16:42:45 -0800
+Subject: [PATCH] fflush: adjust to glibc 2.28 libio.h removal
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Petr Písař: Ported to sharutils-4.15.2 from:
+
+commit 4af4a4a71827c0bc5e0ec67af23edef4f15cee8e
+Author: Paul Eggert <eggert AT cs.ucla.edu>
+Date: Mon Mar 5 10:56:29 2018 -0800
+
+ fflush: adjust to glibc 2.28 libio.h removal
+
+Problem reported by Daniel P. Berrangé in:
+https://lists.gnu.org/r/bug-gnulib/2018-03/msg00000.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Check _IO_EOF_SEEN instead of _IO_ftrylockfile.
+* lib/stdio-impl.h (_IO_IN_BACKUP) [_IO_EOF_SEEN]:
+Define if not already defined.
+
+commit 74d9d6a293d7462dea8f83e7fc5ac792e956a0ad
+Author: Paul Eggert <eggert AT cs.ucla.edu>
+Date: Thu Mar 8 16:42:45 2018 -0800
+
+ fflush: be more paranoid about libio.h change
+
+Suggested by Eli Zaretskii in:
+https://lists.gnu.org/r/emacs-devel/2018-03/msg00270.html
+* lib/fbufmode.c (fbufmode):
+* lib/fflush.c (clear_ungetc_buffer_preserving_position)
+(disable_seek_optimization, rpl_fflush):
+* lib/fpending.c (__fpending):
+* lib/fpurge.c (fpurge):
+* lib/freadable.c (freadable):
+* lib/freadahead.c (freadahead):
+* lib/freading.c (freading):
+* lib/freadptr.c (freadptr):
+* lib/freadseek.c (freadptrinc):
+* lib/fseeko.c (fseeko):
+* lib/fseterr.c (fseterr):
+* lib/fwritable.c (fwritable):
+* lib/fwriting.c (fwriting):
+Look at _IO_ftrylockfile as well as at _IO_EOF_SEEN.
+
+This is needed for glibc-2.28 (First spotted with
+glibc-2.27.9000-13.fc29 on Fedora).
+
+Signed-off-by: Petr Písař <ppisar AT redhat.com>
+---
+ lib/fflush.c | 9 ++++++---
+ lib/fpurge.c | 3 ++-
+ lib/freading.c | 3 ++-
+ lib/fseeko.c | 6 ++++--
+ lib/stdio-impl.h | 6 ++++++
+ 5 files changed, 20 insertions(+), 7 deletions(-)
+
+diff --git a/lib/fflush.c b/lib/fflush.c
+index 5ae3e41..d887ecb 100644
+--- a/lib/fflush.c
++++ b/lib/fflush.c
+@@ -33,7 +33,8 @@
+ #undef fflush
+
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++/* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ /* Clear the stream's ungetc buffer, preserving the value of ftello (fp).
*/
+ static void
+@@ -72,7 +73,8 @@ clear_ungetc_buffer (FILE *fp)
+
+ #endif
+
+-#if ! (defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */)
++#if ! (defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__
== 1)
++/* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ # if (defined __sferror || defined __DragonFly__ || defined __ANDROID__) &&
defined __SNPT
+ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin, Android */
+@@ -148,7 +150,8 @@ rpl_fflush (FILE *stream)
+ if (stream == NULL || ! freading (stream))
+ return fflush (stream);
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+
+ clear_ungetc_buffer_preserving_position (stream);
+
+diff --git a/lib/fpurge.c b/lib/fpurge.c
+index f313b22..a760c4d 100644
+--- a/lib/fpurge.c
++++ b/lib/fpurge.c
+@@ -62,7 +62,8 @@ fpurge (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ ==
1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_IO_read_end = fp->_IO_read_ptr;
+ fp->_IO_write_ptr = fp->_IO_write_base;
+ /* Avoid memory leak when there is an active ungetc buffer. */
+diff --git a/lib/freading.c b/lib/freading.c
+index 0512b19..2341577 100644
+--- a/lib/freading.c
++++ b/lib/freading.c
+@@ -31,7 +31,8 @@ freading (FILE *fp)
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-# if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
++# if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ ==
1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ return ((fp->_flags & _IO_NO_WRITES) != 0
+ || ((fp->_flags & (_IO_NO_READS | _IO_CURRENTLY_PUTTING)) == 0
+ && fp->_IO_read_base != NULL));
+diff --git a/lib/fseeko.c b/lib/fseeko.c
+index 1c65d2a..1b1cc2f 100644
+--- a/lib/fseeko.c
++++ b/lib/fseeko.c
+@@ -47,7 +47,8 @@ fseeko (FILE *fp, off_t offset, int whence)
+ #endif
+
+ /* These tests are based on fpurge.c. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ if (fp->_IO_read_end == fp->_IO_read_ptr
+ && fp->_IO_write_ptr == fp->_IO_write_base
+ && fp->_IO_save_base == NULL)
+@@ -123,7 +124,8 @@ fseeko (FILE *fp, off_t offset, int whence)
+ return -1;
+ }
+
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS,
Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++ /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags &= ~_IO_EOF_SEEN;
+ fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+diff --git a/lib/stdio-impl.h b/lib/stdio-impl.h
+index 502d891..ea38ee2 100644
+--- a/lib/stdio-impl.h
++++ b/lib/stdio-impl.h
+@@ -18,6 +18,12 @@
+ the same implementation of stdio extension API, except that some fields
+ have different naming conventions, or their access requires some casts.
*/
+
++/* Glibc 2.28 made _IO_IN_BACKUP private. For now, work around this
++ problem by defining it ourselves. FIXME: Do not rely on glibc
++ internals. */
++#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
++# define _IO_IN_BACKUP 0x100
++#endif
+
+ /* BSD stdio derived implementations. */
+
+--
+2.14.3
+
diff --git a/disk/lilo/DEPENDS b/disk/lilo/DEPENDS
index eb75d5c..7381d1e 100755
--- a/disk/lilo/DEPENDS
+++ b/disk/lilo/DEPENDS
@@ -1,5 +1,5 @@
depends gnupg &&
depends LD86 &&
depends smgl-fhs &&
-depends UUDECODE &&
+depends sharutils &&
optional_depends lvm '' '' 'device mapper support'
diff --git a/disk/lilo/HISTORY b/disk/lilo/HISTORY
index a66adfd..fb250cb 100644
--- a/disk/lilo/HISTORY
+++ b/disk/lilo/HISTORY
@@ -1,3 +1,6 @@
+2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on sharutils instead of UUDECODE
+
2015-01-30 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 24.1; use lilo.gpg
* CONFIGURE: remove obsolete option
diff --git a/disk/mdadm/DETAILS b/disk/mdadm/DETAILS
index 769546a..d1fdec9 100755
--- a/disk/mdadm/DETAILS
+++ b/disk/mdadm/DETAILS
@@ -1,7 +1,7 @@
SPELL=mdadm
- VERSION=3.4
+ VERSION=4.0
SOURCE=$SPELL-$VERSION.tar.xz
-
SOURCE_HASH=sha512:5de06f3a2b83333e5346a1e858b15e76f75a13a1d5c5f2032fecc6eb167454b282e12ee111ac2abec778e058ec9554708ac317a476778328546603618e6f70f7
+
SOURCE_HASH=sha512:12fb26e6b9c1912698defa406e5e47a7ca8d68d4a9aa7acdc9b463ee2d4a37fc6ecef6beb5395ff619018c3f6bdb6d8c573060d027707540f645ad2265170e8b
# SOURCE2=$SOURCE.sign
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
SOURCE_URL[0]=$KERNEL_URL/pub/linux/utils/raid/$SPELL/$SOURCE
diff --git a/disk/mdadm/HISTORY b/disk/mdadm/HISTORY
index 96b5f70..578aced 100644
--- a/disk/mdadm/HISTORY
+++ b/disk/mdadm/HISTORY
@@ -1,3 +1,6 @@
+2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.0
+
2016-03-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.4
* PRE_BUILD, mdadm-3.3.2-gcc5-1.patch: remove obsolete patch
diff --git a/haskell/haskell-x11/DEPENDS b/haskell/haskell-x11/DEPENDS
index 2b48d79..248d4e1 100755
--- a/haskell/haskell-x11/DEPENDS
+++ b/haskell/haskell-x11/DEPENDS
@@ -1,7 +1,8 @@
depends ghc &&
-depends xorg-libs &&
+depends haskell-data-default &&
+depends haskell-syb &&
depends libx11 &&
depends libxext &&
depends libxrandr &&
-depends haskell-syb &&
-depends haskell-data-default
+depends libxscrnsaver &&
+depends xorg-libs
diff --git a/haskell/haskell-x11/HISTORY b/haskell/haskell-x11/HISTORY
index 78cd075..033032b 100644
--- a/haskell/haskell-x11/HISTORY
+++ b/haskell/haskell-x11/HISTORY
@@ -1,3 +1,6 @@
+2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: add dependency on libxscrnsaver
+
2018-08-01 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.9

diff --git a/http/newsboat/DEPENDS b/http/newsboat/DEPENDS
index 2693bbb..3257a08 100755
--- a/http/newsboat/DEPENDS
+++ b/http/newsboat/DEPENDS
@@ -8,6 +8,7 @@ depends pkgconfig &&
depends libxml2 &&
depends -sub CXX gcc &&
depends stfl &&
+depends json-c &&

if spell_ok gcc && is_version_less $(installed_version gcc) 4.8; then
depends -sub REGEX boost
diff --git a/http/newsboat/HISTORY b/http/newsboat/HISTORY
index 31c35a2..d41db47 100644
--- a/http/newsboat/HISTORY
+++ b/http/newsboat/HISTORY
@@ -1,3 +1,6 @@
+2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on json-c
+
2018-06-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.12

diff --git a/net/crda/DEPENDS b/net/crda/DEPENDS
index 9a358cf..89a048b 100755
--- a/net/crda/DEPENDS
+++ b/net/crda/DEPENDS
@@ -1,5 +1,6 @@
-depends python &&
+depends libgcrypt &&
+depends libnl &&
depends m2crypto &&
-depends wireless-regdb &&
+depends python &&
depends SSL &&
-depends libnl
+depends wireless-regdb
diff --git a/net/crda/HISTORY b/net/crda/HISTORY
index 4617990..6500035 100644
--- a/net/crda/HISTORY
+++ b/net/crda/HISTORY
@@ -1,3 +1,6 @@
+2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependency on libgcrypt
+
2018-03-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS, patches/*, BUILD, PRE_BUILD: spell created
* patches/*: patches adapted from gentoo to make crda compile
diff --git a/net/net-tools/DEPENDS b/net/net-tools/DEPENDS
index b3e5051..f0971e8 100755
--- a/net/net-tools/DEPENDS
+++ b/net/net-tools/DEPENDS
@@ -2,6 +2,7 @@ depends coreutils &&
depends gnupg &&
depends INITSCRIPTS &&
depends smgl-fhs &&
+depends unzip &&

#if [ "$DECNET" == "y" ]; then
# depends libdnet
diff --git a/net/net-tools/HISTORY b/net/net-tools/HISTORY
index a21d98f..c8d41a5 100644
--- a/net/net-tools/HISTORY
+++ b/net/net-tools/HISTORY
@@ -1,3 +1,6 @@
+2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: add dependency on unzip
+
2017-10-12 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: sf.net URL unstable, switch to SMGL server

diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 3dc220f..604bf99 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,6 @@
+2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * patches/qt5-qtbase-glibc.patch: fix breakage caused by glibc 2.28
+
2018-06-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.11.1
* patches/*: update
diff --git a/qt5/qtbase/patches/qt5-qtbase-glibc.patch
b/qt5/qtbase/patches/qt5-qtbase-glibc.patch
new file mode 100644
index 0000000..022b698
--- /dev/null
+++ b/qt5/qtbase/patches/qt5-qtbase-glibc.patch
@@ -0,0 +1,53 @@
+diff -up
qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h.glibc
qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h
+--- qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h.glibc
2018-06-15 09:29:31.000000000 +0200
++++ qtbase-everywhere-src-5.11.1/mkspecs/linux-g++/qplatformdefs.h
2018-07-26 15:40:56.887961897 +0200
+@@ -72,7 +72,9 @@
+ #include <sys/time.h>
+ #include <sys/shm.h>
+ #include <sys/socket.h>
++#if 0
+ #include <sys/stat.h>
++#endif
+ #include <sys/wait.h>
+ #include <netinet/in.h>
+
+diff -up
qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp.glibc
qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp
+---
qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp.glibc
2018-06-15 09:29:31.000000000 +0200
++++ qtbase-everywhere-src-5.11.1/src/corelib/io/qfilesystemengine_unix.cpp
2018-07-26 16:34:54.346840184 +0200
+@@ -50,7 +50,9 @@
+ #include <pwd.h>
+ #include <stdlib.h> // for realpath()
+ #include <sys/types.h>
++#if 0
+ #include <sys/stat.h>
++#endif
+ #include <unistd.h>
+ #include <stdio.h>
+ #include <errno.h>
+@@ -91,7 +93,9 @@ extern "C" NSString *NSTemporaryDirector
+ # include <sys/syscall.h>
+ # include <sys/sendfile.h>
+ # include <linux/fs.h>
++#if 0
+ # include <linux/stat.h>
++#endif
+
+ // in case linux/fs.h is too old and doesn't define it:
+ #ifndef FICLONE
+@@ -105,13 +109,13 @@ extern "C" NSString *NSTemporaryDirector
+ # undef SYS_renameat2
+ # undef SYS_statx
+ # undef STATX_BASIC_STATS
+-# else
+-# if !QT_CONFIG(renameat2) && defined(SYS_renameat2)
++# else
++# if 0 && !QT_CONFIG(renameat2) && defined(SYS_renameat2)
+ static int renameat2(int oldfd, const char *oldpath, int newfd, const char
*newpath, unsigned flags)
+ { return syscall(SYS_renameat2, oldfd, oldpath, newfd, newpath, flags); }
+ # endif
+
+-# if !QT_CONFIG(statx) && defined(SYS_statx)
++# if 0 && !QT_CONFIG(statx) && defined(SYS_statx)
+ static int statx(int dirfd, const char *pathname, int flag, unsigned mask,
struct statx *statxbuf)
+ { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); }
+ # elif !QT_CONFIG(statx) && !defined(SYS_statx)
diff --git a/video-libs/x264/DEPENDS b/video-libs/x264/DEPENDS
index d8068c6..9d3183a 100755
--- a/video-libs/x264/DEPENDS
+++ b/video-libs/x264/DEPENDS
@@ -1 +1 @@
-optional_depends "yasm" "--enable-asm" "--disable-asm" "use assembler
optimizations"
+optional_depends "nasm" "--enable-asm" "--disable-asm" "use assembler
optimizations"
diff --git a/video-libs/x264/HISTORY b/video-libs/x264/HISTORY
index 825728a..2a42184 100644
--- a/video-libs/x264/HISTORY
+++ b/video-libs/x264/HISTORY
@@ -1,3 +1,6 @@
+2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: depend on nasm instead of yasm
+
2018-06-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 20180615-2245

diff --git a/x11/conky/DEPENDS b/x11/conky/DEPENDS
index ade8897..b9845a5 100755
--- a/x11/conky/DEPENDS
+++ b/x11/conky/DEPENDS
@@ -1,5 +1,8 @@
depends glib2 &&
depends cmake &&
+depends LUA &&
+depends libmicrohttpd &&
+

optional_depends libx11 \
"-DBUILD_X11=on" \
@@ -73,11 +76,6 @@ optional_depends imlib2 \
"-DBUILD_IMLIB2=off" \
"for Imlib2 support" &&

-optional_depends LUA \
- "--enable-lua" \
- "--disable-lua" \
- "for Lua scripting support" &&
-
optional_depends wireless_tools \
"-DBUILD_WLAN=on" \
"-DBUILD_WLAN=off" \
diff --git a/x11/conky/HISTORY b/x11/conky/HISTORY
index d8d43b8..1be83de 100644
--- a/x11/conky/HISTORY
+++ b/x11/conky/HISTORY
@@ -1,3 +1,6 @@
+2018-08-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DEPENDS: make dependency on LUA mandatory, depend on libmicrohttpd
+
2018-02-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: add dependency on LUA



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (18f7df52b72816a586235bf05b06ec588edef221), Florian Franzmann, 08/06/2018

Archive powered by MHonArc 2.6.24.

Top of Page