diff options
| author | Florian Franzmann | 2019-05-08 21:22:18 +0200 |
|---|---|---|
| committer | Florian Franzmann | 2019-05-09 18:32:47 +0200 |
| commit | 550606a7415d3bee609bb2b0702482e69c97cd20 (patch) | |
| tree | 466c8b96700f1f799b51149ad11e30f305db65a0 /x11 | |
| parent | 745da96f5acd7116801688ea8871846a42c6794f (diff) | |
x11/slim: fix linker error
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/slim/HISTORY | 4 | ||||
| -rwxr-xr-x | x11/slim/PRE_BUILD | 4 | ||||
| -rw-r--r-- | x11/slim/slim-1.3.6-fix-libslim-libraries.patch | 20 |
3 files changed, 27 insertions, 1 deletions
diff --git a/x11/slim/HISTORY b/x11/slim/HISTORY index 7576d3dbf3..96977517bc 100644 --- a/x11/slim/HISTORY +++ b/x11/slim/HISTORY @@ -1,3 +1,7 @@ +2019-05-08 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * PRE_BUILD, slim-1.3.6-fix-libslim-libraries.patch: + add patch from Arch to fix linker error + 2017-08-15 Eric Sandall <sandalle@sourcemage.org> * DEPENDS: Depends on libxrandr diff --git a/x11/slim/PRE_BUILD b/x11/slim/PRE_BUILD index 2704af0cb0..e71314047a 100755 --- a/x11/slim/PRE_BUILD +++ b/x11/slim/PRE_BUILD @@ -3,4 +3,6 @@ cd "$SOURCE_DIRECTORY" && patch -p0 < "$SPELL_DIRECTORY/no-systemd.patch" && patch -p0 < "$SPELL_DIRECTORY/no-pam.patch" && -patch -p0 < "$SPELL_DIRECTORY/gcc43.patch" +patch -p0 < "$SPELL_DIRECTORY/gcc43.patch" && +patch -p1 < "$SPELL_DIRECTORY/slim-1.3.6-fix-libslim-libraries.patch" + diff --git a/x11/slim/slim-1.3.6-fix-libslim-libraries.patch b/x11/slim/slim-1.3.6-fix-libslim-libraries.patch new file mode 100644 index 0000000000..b6c90f9f46 --- /dev/null +++ b/x11/slim/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} + ) |