Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e19aa86f97e29970b2658d834693e8eeb26f63e0)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e19aa86f97e29970b2658d834693e8eeb26f63e0)
  • Date: Wed, 14 Jun 2023 06:47:38 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

database/pxlib/DETAILS | 2
database/pxlib/HISTORY | 3
disk/dvd+rw-tools/HISTORY | 3
disk/dvd+rw-tools/PRE_BUILD | 3
kde-gear/kimagemapeditor/DEPENDS | 2
kde-gear/kimagemapeditor/HISTORY | 3
kde5-apps/arianna/DETAILS | 2
kde5-apps/arianna/HISTORY | 3
libs/dotconf/DETAILS | 2
libs/dotconf/HISTORY | 3
utils/gpm/HISTORY | 4
utils/gpm/PRE_BUILD | 6 -
utils/gpm/gpm-1.20.7-glibc-2.26.patch | 12 --
utils/gpm/gpm-1.20.7-musl.patch | 70 -------------
utils/gpm/gpm-1.20.7-sysmacros.patch | 30 -----
utils/gpm/patches/gpm-1.20.7-consolidated-1.patch | 116
++++++++++++++++++++++
16 files changed, 143 insertions(+), 121 deletions(-)

New commits:
commit e19aa86f97e29970b2658d834693e8eeb26f63e0
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dotconf: => master

commit 13b9923b9eede28c8fe7b31deb69b317e06c1b71
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pxlib: => 0.6.8

commit 8e1ee302208451f4d5eb909e9e3483ee04522517
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

gpm - fix build

commit efae36b858bb98402a7f633659b5e17a6dd5e2aa
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

dvd+rw-tools - fix build

commit 46ba80e2e4e49dbdfdc7e9af4eceeb97c67ac48b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

arianna: => 1.1.0

commit dea70f75c834df827f15d20e98a11bb236304b08
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

kimagemapeditor - tweak depends

diff --git a/database/pxlib/DETAILS b/database/pxlib/DETAILS
index bff003b..d94c0ab 100755
--- a/database/pxlib/DETAILS
+++ b/database/pxlib/DETAILS
@@ -1,6 +1,6 @@
SPELL=pxlib
VERSION=0.6.8
-
SOURCE_HASH=sha512:3e8a22e09b086eec65d141ce3bd96f5dd9dabef44b5e69c46e661ed4e4c954865378c9415b0c054f932e453706c0c83033d0d3ffa820f96b5c1026928989cfea
+
SOURCE_HASH=sha512:a72fc9922aeb026804c908fd357e0145944fc6240093d93a3666606558f9e3ec3510317ae88ac14c78b14d63b4dc4588571e592327e1d90d7784e5181887e69b
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://pxlib.sourceforge.net/
diff --git a/database/pxlib/HISTORY b/database/pxlib/HISTORY
index 798f2ce..eee317f 100644
--- a/database/pxlib/HISTORY
+++ b/database/pxlib/HISTORY
@@ -1,3 +1,6 @@
+2023-06-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: fix hash
+
2018-11-20 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.6.8

diff --git a/disk/dvd+rw-tools/HISTORY b/disk/dvd+rw-tools/HISTORY
index 339864c..bb2f9f5 100644
--- a/disk/dvd+rw-tools/HISTORY
+++ b/disk/dvd+rw-tools/HISTORY
@@ -1,3 +1,6 @@
+2023-06-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: fix build, from blfs
+
2011-07-30 Florian Franzmann <bwlf AT bandrate.org>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/disk/dvd+rw-tools/PRE_BUILD b/disk/dvd+rw-tools/PRE_BUILD
index 1858e23..94de297 100755
--- a/disk/dvd+rw-tools/PRE_BUILD
+++ b/disk/dvd+rw-tools/PRE_BUILD
@@ -1,3 +1,6 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
+sed -i '/stat.h/a #include <sys/sysmacros.h>' growisofs.c &&
+sed -i '/stdlib/a #include <limits.h>' transport.hxx &&
+
patch -p1 < $SPELL_DIRECTORY/linux-2.6.23-headers.patch
diff --git a/kde-gear/kimagemapeditor/DEPENDS
b/kde-gear/kimagemapeditor/DEPENDS
index 15e410b..938e1d7 100755
--- a/kde-gear/kimagemapeditor/DEPENDS
+++ b/kde-gear/kimagemapeditor/DEPENDS
@@ -1,4 +1,5 @@
source $GRIMOIRE/KDE_DEPENDS &&
+depends qtwebengine &&
depends kconfig &&
depends kconfigwidgets &&
depends kcoreaddons &&
@@ -6,7 +7,6 @@ depends kcrash &&
depends kdbusaddons &&
depends kdoctools &&
depends kguiaddons &&
-depends khtml &&
depends ki18n &&
depends kparts &&
depends kwidgetsaddons &&
diff --git a/kde-gear/kimagemapeditor/HISTORY
b/kde-gear/kimagemapeditor/HISTORY
index e6eca0a..1094efb 100644
--- a/kde-gear/kimagemapeditor/HISTORY
+++ b/kde-gear/kimagemapeditor/HISTORY
@@ -1,3 +1,6 @@
+2023-06-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: khtml => qtwebengine
+
2023-01-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 22.12.1

diff --git a/kde5-apps/arianna/DETAILS b/kde5-apps/arianna/DETAILS
index fa4fb8b..9a83c78 100755
--- a/kde5-apps/arianna/DETAILS
+++ b/kde5-apps/arianna/DETAILS
@@ -1,5 +1,5 @@
SPELL=arianna
- VERSION=1.0.1
+ VERSION=1.1.0
SOURCE=$SPELL-$VERSION.tar.xz
SOURCE_URL=https://download.kde.org/stable/$SPELL/$SOURCE
SOURCE2=$SOURCE.sig
diff --git a/kde5-apps/arianna/HISTORY b/kde5-apps/arianna/HISTORY
index 143438b..be3bf50 100644
--- a/kde5-apps/arianna/HISTORY
+++ b/kde5-apps/arianna/HISTORY
@@ -1,3 +1,6 @@
+2023-06-10 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 1.1.0
+
2023-04-23 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.0.1

diff --git a/libs/dotconf/DETAILS b/libs/dotconf/DETAILS
index 2974b87..7a62c2a 100755
--- a/libs/dotconf/DETAILS
+++ b/libs/dotconf/DETAILS
@@ -1,7 +1,7 @@
SPELL=dotconf
VERSION=master
SOURCE=master.zip
-
SOURCE_HASH=sha512:5abbc3fcb4938b230e6e9947d63153e4c83a364e075b4b438d8914173cdc27aa987dade13dc59ed9df349589114a6b93d0503a3230a5d6753076cb5fa7eb39cc
+
SOURCE_HASH=sha512:46ec167951359ccb0bd23ba8b7c06c743f85a3249c25840b70d2f600f637f61d05edd4e0c87f3ee0f57951a4dc544bd9ce38702c90f584218122b282e19e4c1c
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
WEB_SITE=https://github.com/williamh/dotconf
SOURCE_URL[0]=$WEB_SITE/archive/$SOURCE
diff --git a/libs/dotconf/HISTORY b/libs/dotconf/HISTORY
index 37cd95f..8f6762f 100644
--- a/libs/dotconf/HISTORY
+++ b/libs/dotconf/HISTORY
@@ -1,3 +1,6 @@
+2023-06-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: fix hash
+
2015-02-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: new website & url, version master
project is basically dead but the git archive is newer than the
previous version
diff --git a/utils/gpm/HISTORY b/utils/gpm/HISTORY
index 15c007b..95fb5e0 100644
--- a/utils/gpm/HISTORY
+++ b/utils/gpm/HISTORY
@@ -1,3 +1,7 @@
+2023-06-13 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD: tweak
+ * patches/*: replace existing patches by consolidated patch from blfs
+
2019-05-20 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: Fixed circular dep with ncurses

diff --git a/utils/gpm/PRE_BUILD b/utils/gpm/PRE_BUILD
index 4fec01a..a8045f6 100755
--- a/utils/gpm/PRE_BUILD
+++ b/utils/gpm/PRE_BUILD
@@ -1,8 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-
-patch -p1 < "$SPELL_DIRECTORY/gpm-1.20.7-glibc-2.26.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/gpm-1.20.7-sysmacros.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/gpm-1.20.7-musl.patch" &&
-
+apply_patch_dir &&
./autogen.sh
diff --git a/utils/gpm/gpm-1.20.7-glibc-2.26.patch
b/utils/gpm/gpm-1.20.7-glibc-2.26.patch
deleted file mode 100644
index ef2de01..0000000
--- a/utils/gpm/gpm-1.20.7-glibc-2.26.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/629774
---- a/src/prog/gpm-root.y 2012-10-26 17:21:38.000000000 -0400
-+++ b/src/prog/gpm-root.y 2017-09-07 20:39:51.933264063 -0400
-@@ -1197,7 +1197,7 @@
- /* reap your zombies */
- childaction.sa_handler=reap_children;
- #if defined(__GLIBC__)
-- __sigemptyset(&childaction.sa_mask);
-+ sigemptyset(&childaction.sa_mask);
- #else /* __GLIBC__ */
- childaction.sa_mask=0;
- #endif /* __GLIBC__ */
diff --git a/utils/gpm/gpm-1.20.7-musl.patch b/utils/gpm/gpm-1.20.7-musl.patch
deleted file mode 100644
index ce0e37a..0000000
--- a/utils/gpm/gpm-1.20.7-musl.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From eb0e14f8a5c414603b2e882df54b9fec138104ec Mon Sep 17 00:00:00 2001
-From: Dima Krasner <dima AT dimakrasner.com>
-Date: Wed, 12 Nov 2014 23:06:46 +0200
-Subject: [PATCH] Added musl support to libgpm and the daemon.
-
-[Upstream patch backported from the github repository,
-https://github.com/telmich/gpm/commit/d88fb1de5803c366ab62f7de9ee5d83207fb2afe.]
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni AT free-electrons.com>
----
- src/daemon/open_console.c | 1 +
- src/prog/display-buttons.c | 1 +
- src/prog/display-coords.c | 1 +
- src/prog/gpm-root.y | 4 ++--
- 4 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c
-index 98297c9..4d6c0af 100644
---- a/src/daemon/open_console.c
-+++ b/src/daemon/open_console.c
-@@ -21,6 +21,7 @@
-
- #include <fcntl.h> /* open and co. */
- #include <sys/stat.h> /* stat() */
-+#include <sys/types.h> /* major() */
- #include <sys/ioctl.h> /* ioctl */
-
- /* Linux specific (to be outsourced in gpm2 */
-diff --git a/src/prog/display-buttons.c b/src/prog/display-buttons.c
-index de8e5b2..38d2f11 100644
---- a/src/prog/display-buttons.c
-+++ b/src/prog/display-buttons.c
-@@ -36,6 +36,7 @@
- #include <stdio.h> /* printf() */
- #include <time.h> /* time() */
- #include <errno.h> /* errno */
-+#include <sys/select.h> /* fd_set and FD_* */
- #include <gpm.h> /* gpm information */
-
- /* display resulting data */
-diff --git a/src/prog/display-coords.c b/src/prog/display-coords.c
-index ed15c8a..411283a 100644
---- a/src/prog/display-coords.c
-+++ b/src/prog/display-coords.c
-@@ -37,6 +37,7 @@
- #include <stdio.h> /* printf() */
- #include <time.h> /* time() */
- #include <errno.h> /* errno */
-+#include <sys/select.h> /* fd_set and FD_* */
- #include <gpm.h> /* gpm information */
-
- /* display resulting data */
-diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
-index 069d801..188ae35 100644
---- a/src/prog/gpm-root.y
-+++ b/src/prog/gpm-root.y
-@@ -1199,9 +1199,9 @@ int main(int argc, char **argv)
- #if defined(__GLIBC__)
- __sigemptyset(&childaction.sa_mask);
- #else /* __GLIBC__ */
-- childaction.sa_mask=0;
-+ sigemptyset(&childaction.sa_mask);
- #endif /* __GLIBC__ */
-- childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
-+ childaction.sa_flags=0;
- sigaction(SIGCHLD,&childaction,NULL);
-
- /*....................................... Connect and get your buffer */
---
-2.1.0
diff --git a/utils/gpm/gpm-1.20.7-sysmacros.patch
b/utils/gpm/gpm-1.20.7-sysmacros.patch
deleted file mode 100644
index d8ab2d1..0000000
--- a/utils/gpm/gpm-1.20.7-sysmacros.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b350aee4ea5785a75cb6ad770f6b768c506ebb70 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier AT gentoo.org>
-Date: Mon, 14 Mar 2016 15:39:54 -0400
-Subject: [PATCH] fix building w/newer glibc
-
-Linux C libraries are looking to disentangle sysmacros.h from the
-sys/types.h include, so make sure we pull in the header when it is
-found.
----
- src/daemon/open_console.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c
-index 4d6c0af..6dd43e6 100644
---- a/src/daemon/open_console.c
-+++ b/src/daemon/open_console.c
-@@ -24,6 +24,10 @@
- #include <sys/types.h> /* major() */
- #include <sys/ioctl.h> /* ioctl */
-
-+#ifdef HAVE_SYS_SYSMACROS_H
-+#include <sys/sysmacros.h> /* major() w/newer glibc */
-+#endif
-+
- /* Linux specific (to be outsourced in gpm2 */
- #include <linux/serial.h> /* for serial console check */
- #include <asm/ioctls.h> /* for serial console check */
---
-2.6.2
-
diff --git a/utils/gpm/patches/gpm-1.20.7-consolidated-1.patch
b/utils/gpm/patches/gpm-1.20.7-consolidated-1.patch
new file mode 100644
index 0000000..adf2dae
--- /dev/null
+++ b/utils/gpm/patches/gpm-1.20.7-consolidated-1.patch
@@ -0,0 +1,116 @@
+Submitted by: Pierre Labastie <pierre dot labastie at neuf dot fr>
+Date: 2020-05-10
+Initial Package Version: 1.20.7
+Origin: Upstream + PR's
+Upstream Status: some fixes committed, others pending
+Description: Fix several build failures
+ - some introduced by glibc-2.26
+ - some introduced by gcc-10
+ - also fix an ignored error when gpm.h is not already in
+ /usr/include
+diff -Naur gpm-1.20.7.old/src/daemon/open_console.c
gpm-1.20.7.new/src/daemon/open_console.c
+--- gpm-1.20.7.old/src/daemon/open_console.c 2012-10-26 23:21:38.000000000
+0200
++++ gpm-1.20.7.new/src/daemon/open_console.c 2020-05-10 15:48:59.752067421
+0200
+@@ -23,6 +23,10 @@
+ #include <sys/stat.h> /* stat() */
+ #include <sys/ioctl.h> /* ioctl */
+
++#ifdef HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h> /* major() w/newer glibc */
++#endif
++
+ /* Linux specific (to be outsourced in gpm2 */
+ #include <linux/serial.h> /* for serial console check */
+ #include <asm/ioctls.h> /* for serial console check */
+diff -Naur gpm-1.20.7.old/src/headers/daemon.h
gpm-1.20.7.new/src/headers/daemon.h
+--- gpm-1.20.7.old/src/headers/daemon.h 2012-10-26 23:21:38.000000000
+0200
++++ gpm-1.20.7.new/src/headers/daemon.h 2020-05-10 15:48:52.719159555
+0200
+@@ -180,7 +180,7 @@
+ extern Gpm_Type mice[];
+ extern Gpm_Type *repeated_type;
+
+-time_t last_selection_time;
++extern time_t last_selection_time;
+
+
+
+diff -Naur gpm-1.20.7.old/src/prog/display-buttons.c
gpm-1.20.7.new/src/prog/display-buttons.c
+--- gpm-1.20.7.old/src/prog/display-buttons.c 2012-10-26 23:21:38.000000000
+0200
++++ gpm-1.20.7.new/src/prog/display-buttons.c 2020-05-10 15:48:59.751067434
+0200
+@@ -36,7 +36,7 @@
+ #include <stdio.h> /* printf() */
+ #include <time.h> /* time() */
+ #include <errno.h> /* errno */
+-#include <gpm.h> /* gpm information */
++#include "headers/gpm.h" /* gpm information */
+
+ /* display resulting data */
+ int display_data(Gpm_Event *event, void *data)
+diff -Naur gpm-1.20.7.old/src/prog/display-coords.c
gpm-1.20.7.new/src/prog/display-coords.c
+--- gpm-1.20.7.old/src/prog/display-coords.c 2012-10-26 23:21:38.000000000
+0200
++++ gpm-1.20.7.new/src/prog/display-coords.c 2020-05-10 15:48:59.751067434
+0200
+@@ -37,7 +37,7 @@
+ #include <stdio.h> /* printf() */
+ #include <time.h> /* time() */
+ #include <errno.h> /* errno */
+-#include <gpm.h> /* gpm information */
++#include "headers/gpm.h" /* gpm information */
+
+ /* display resulting data */
+ int display_data(Gpm_Event *event, void *data)
+diff -Naur gpm-1.20.7.old/src/prog/get-versions.c
gpm-1.20.7.new/src/prog/get-versions.c
+--- gpm-1.20.7.old/src/prog/get-versions.c 2012-10-26 23:21:38.000000000
+0200
++++ gpm-1.20.7.new/src/prog/get-versions.c 2020-05-10 15:48:59.751067434
+0200
+@@ -22,7 +22,7 @@
+ ********/
+
+ #include <stdio.h> /* printf() */
+-#include <gpm.h> /* gpm information */
++#include "headers/gpm.h" /* gpm information */
+
+ int main()
+ {
+diff -Naur gpm-1.20.7.old/src/prog/gpm-root.y
gpm-1.20.7.new/src/prog/gpm-root.y
+--- gpm-1.20.7.old/src/prog/gpm-root.y 2012-10-26 23:21:38.000000000 +0200
++++ gpm-1.20.7.new/src/prog/gpm-root.y 2020-05-10 15:48:59.752067421 +0200
+@@ -443,6 +443,7 @@
+ }
+
+ /*---------------------------------------------------------------------*/
++#if 0
+ static int f_debug_one(FILE *f, Draw *draw)
+ {
+ DrawItem *ip;
+@@ -465,6 +466,7 @@
+ #undef LINE
+ return 0;
+ }
++#endif
+
+ int f_debug(int mode, DrawItem *self, int uid)
+ {
+@@ -960,10 +962,8 @@
+ /*------------*/
+ static inline void scr_restore(int fd, FILE *f, unsigned char *buffer, int
vc)
+ {
+- int x,y, dumpfd;
++ int dumpfd;
+ char dumpname[20];
+-
+- x=buffer[2]; y=buffer[3];
+
+ /* WILL NOT WORK WITH DEVFS! FIXME! */
+ sprintf(dumpname,"/dev/vcsa%i",vc);
+@@ -1196,11 +1196,7 @@
+ LOG_DAEMON :
LOG_USER);
+ /* reap your zombies */
+ childaction.sa_handler=reap_children;
+-#if defined(__GLIBC__)
+- __sigemptyset(&childaction.sa_mask);
+-#else /* __GLIBC__ */
+- childaction.sa_mask=0;
+-#endif /* __GLIBC__ */
++ sigemptyset(&childaction.sa_mask);
+ childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */
+ sigaction(SIGCHLD,&childaction,NULL);
+



  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (e19aa86f97e29970b2658d834693e8eeb26f63e0), Treeve Jelbert, 06/14/2023

Archive powered by MHonArc 2.6.24.

Top of Page