Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (6fb1d4ec6bce17571cd3f93995863304e823637d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (6fb1d4ec6bce17571cd3f93995863304e823637d)
  • Date: Wed, 10 Aug 2022 03:25:39 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemaage.org>:

x11/slim/HISTORY | 5 ++++
x11/slim/PRE_BUILD | 6 ----
x11/slim/patches/gcc43.patch | 10 ++++++++
x11/slim/patches/no-pam.patch | 13 ++++++++++
x11/slim/patches/no-systemd.patch | 11 ++++++++
x11/slim/patches/slim-1.3.6-fix-libslim-libraries.patch | 20
++++++++++++++++
x11/slim/patches/slim-1.3.6-gcc11.patch | 12 +++++++++
7 files changed, 72 insertions(+), 5 deletions(-)

New commits:
commit 6fb1d4ec6bce17571cd3f93995863304e823637d
Author: Pavel Vinogradov <public AT sourcemaage.org>
Commit: Pavel Vinogradov <public AT sourcemaage.org>

x11/slim: reorganized the patches + added gcc11 fix from Gentoo

diff --git a/x11/slim/HISTORY b/x11/slim/HISTORY
index a060c81..1fc21df 100644
--- a/x11/slim/HISTORY
+++ b/x11/slim/HISTORY
@@ -1,3 +1,8 @@
+2022-08-09 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD, patches/{gcc43.patch,no-pam.patch,no-systemd.patch,
+ slim-1.3.6-fix-libslim-libraries.patch,slim-1.3.6-gcc11.patch}:
+ moved patches into a subdirectory, added gcc11 fix from Gentoo
+
2019-05-08 Florian Franzmann <bwlf AT bandrate.org>
* PRE_BUILD, slim-1.3.6-fix-libslim-libraries.patch:
add patch from Arch to fix linker error
diff --git a/x11/slim/PRE_BUILD b/x11/slim/PRE_BUILD
index e713140..8821392 100755
--- a/x11/slim/PRE_BUILD
+++ b/x11/slim/PRE_BUILD
@@ -1,8 +1,4 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/no-systemd.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/no-pam.patch" &&
-patch -p0 < "$SPELL_DIRECTORY/gcc43.patch" &&
-patch -p1 < "$SPELL_DIRECTORY/slim-1.3.6-fix-libslim-libraries.patch"
-
+apply_patch_dir patches
diff --git a/x11/slim/patches/gcc43.patch b/x11/slim/patches/gcc43.patch
new file mode 100644
index 0000000..4f00103
--- /dev/null
+++ b/x11/slim/patches/gcc43.patch
@@ -0,0 +1,10 @@
+--- a/cfg.h 2007-07-15 18:09:28.000000000 +0400
++++ b/cfg.h 2008-04-17 10:47:59.073553726 +0400
+@@ -14,6 +14,7 @@
+ #include <string>
+ #include <map>
+ #include <vector>
++#include <cstdlib>
+
+ #define INPUT_MAXLENGTH_NAME 30
+ #define INPUT_MAXLENGTH_PASSWD 50
diff --git a/x11/slim/patches/no-pam.patch b/x11/slim/patches/no-pam.patch
new file mode 100644
index 0000000..8ddf917
--- /dev/null
+++ b/x11/slim/patches/no-pam.patch
@@ -0,0 +1,13 @@
+--- a/CMakeLists.txt 2013-10-09 16:21:02.000000000 +0400
++++ b/CMakeLists.txt 2013-10-09 16:28:30.210499682 +0400
+@@ -221,7 +221,9 @@
+ ####### install
+ # slim
+ install(TARGETS slim RUNTIME DESTINATION bin)
+-install(TARGETS slimlock RUNTIME DESTINATION bin)
++if(BUILD_SLIMLOCK)
++ install(TARGETS slimlock RUNTIME DESTINATION bin)
++endif(BUILD_SLIMLOCK)
+
+ if (BUILD_SHARED_LIBS)
+ set_target_properties(libslim PROPERTIES
diff --git a/x11/slim/patches/no-systemd.patch
b/x11/slim/patches/no-systemd.patch
new file mode 100644
index 0000000..2e23db2
--- /dev/null
+++ b/x11/slim/patches/no-systemd.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt 2013-10-01 18:38:05.000000000 -0400
++++ b/CMakeLists.txt 2016-10-03 20:14:40.203096183 -0400
+@@ -240,7 +240,7 @@
+ # configure
+ install(FILES slim.conf DESTINATION ${SYSCONFDIR})
+ # systemd service file
+-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND USE_SYSTEMD)
+ install(FILES slim.service DESTINATION ${LIBDIR}/systemd/system)
+ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ # themes directory
diff --git a/x11/slim/patches/slim-1.3.6-fix-libslim-libraries.patch
b/x11/slim/patches/slim-1.3.6-fix-libslim-libraries.patch
new file mode 100644
index 0000000..b6c90f9
--- /dev/null
+++ b/x11/slim/patches/slim-1.3.6-fix-libslim-libraries.patch
@@ -0,0 +1,20 @@
+diff -upr slim-1.3.6.orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt
+--- slim-1.3.6.orig/CMakeLists.txt 2013-10-02 16:16:22.000000000 +0300
++++ slim-1.3.6/CMakeLists.txt 2013-10-02 16:19:57.000000000 +0300
+@@ -119,6 +119,7 @@ if(USE_PAM)
+ if(PAM_FOUND)
+ message("\tPAM Found")
+ set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM")
++ target_link_libraries(libslim ${PAM_LIBRARY})
+ target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY})
+ target_link_libraries(slimlock ${PAM_LIBRARY})
+ include_directories(${PAM_INCLUDE_DIR})
+@@ -178,6 +179,8 @@ include_directories(
+ )
+
+ target_link_libraries(libslim
++ ${X11_Xft_LIB}
++ ${X11_Xrandr_LIB}
+ ${JPEG_LIBRARIES}
+ ${PNG_LIBRARIES}
+ )
diff --git a/x11/slim/patches/slim-1.3.6-gcc11.patch
b/x11/slim/patches/slim-1.3.6-gcc11.patch
new file mode 100644
index 0000000..a6b07c6
--- /dev/null
+++ b/x11/slim/patches/slim-1.3.6-gcc11.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/786498
+--- a/panel.cpp
++++ b/panel.cpp
+@@ -48,7 +48,7 @@
+ gcm = GCGraphicsExposures;
+ gcv.graphics_exposures = False;
+ WinGC = XCreateGC(Dpy, Win, gcm, &gcv);
+- if (WinGC < 0) {
++ if (WinGC == 0) {
+ cerr << APPNAME
+ << ": failed to create pixmap\n.";
+ exit(ERR_EXIT);



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (6fb1d4ec6bce17571cd3f93995863304e823637d), Pavel Vinogradov, 08/09/2022

Archive powered by MHonArc 2.6.24.

Top of Page