diff options
| -rw-r--r-- | main/slim/APKBUILD | 40 | ||||
| -rw-r--r-- | main/slim/libslim-underlinking.patch | 13 | ||||
| -rw-r--r-- | main/slim/no-slimlock.patch | 16 | ||||
| -rw-r--r-- | main/slim/pthread.patch | 18 | ||||
| -rw-r--r-- | main/slim/snprintf.patch | 13 |
5 files changed, 71 insertions, 29 deletions
diff --git a/main/slim/APKBUILD b/main/slim/APKBUILD index 138c5c9415..5e0b6a4b98 100644 --- a/main/slim/APKBUILD +++ b/main/slim/APKBUILD @@ -1,19 +1,21 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=slim -pkgver=1.3.5 -pkgrel=2 +pkgver=1.3.6 +pkgrel=0 pkgdesc="Desktop-independent graphical login manager for X11" url="http://slim.berlios.de/" arch="all" license="GPL-2" subpackages="$pkgname-doc" makedepends="libxmu-dev libpng-dev libjpeg-turbo-dev libxft-dev - cmake linux-pam-dev" + cmake libxrandr-dev consolekit-dev" depends= install= source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz http://dev.alpinelinux.org/~ncopa/alpine/slim-alpinelinux.tar.gz - pthread.patch + no-slimlock.patch + libslim-underlinking.patch + snprintf.patch $pkgname.logrotate $pkgname.initd " @@ -41,11 +43,11 @@ prepare() { build() { cd "$srcdir/slim-$pkgver" cmake . \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DUSE_PAM=no \ - -DUSE_CONSOLEKIT=no \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DUSE_PAM=no \ + -DUSE_CONSOLEKIT=yes \ || return 1 @@ -70,8 +72,24 @@ package() { rm -rf "$pkgdir"/usr/share/slim/themes/default } -md5sums="1153e6993f9c9333e4cf745411d03472 slim-1.3.5.tar.gz +md5sums="d40d256394f9ef34cef34d2aa9cb52e6 slim-1.3.6.tar.gz cd63232c7770b0e67a009a94c2a46b82 slim-alpinelinux.tar.gz -a2fc2874a3bb2470a96dfa2a34833d05 pthread.patch +b443d1a03f767fcb1fe33a10a532cef0 no-slimlock.patch +348be5e6570881f601b68c3ba2f7bbed libslim-underlinking.patch +111e3a5f1e5e3d71f2c75f20a285932b snprintf.patch 43da096480bf72c3ccec8ad8400f34f0 slim.logrotate 6ee3a023e56052528295034be809cfc6 slim.initd" +sha256sums="21defeed175418c46d71af71fd493cd0cbffd693f9d43c2151529125859810df slim-1.3.6.tar.gz +dfa910e8d8c1cd3b687d7b0b49d1cb36ba4148de8862667c4ca03da194e42e64 slim-alpinelinux.tar.gz +7658a24019bec1de41de037525731a9ccdb9d05867a99efaeb49af2fb8e7a9a5 no-slimlock.patch +cf506b6a42c86c45c2614e3e36b3e6b280efba93be53bb30a280c2b0c2dc2196 libslim-underlinking.patch +ef1fac57a57dfb696db110c8741c0902dd84bac50f516f52d0ee0c8bd4133d5d snprintf.patch +5bf44748b5003f2332d8b268060c400120b9100d033fa9d35468670d827f6def slim.logrotate +fcb6b74588b3c9fb4001cdbf0d52a72db3b325118d8112b8186c5cafe0b1c1fa slim.initd" +sha512sums="345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c slim-1.3.6.tar.gz +45e080bd5cc49e5c380d851fee7622ffe6ce9b11fdabe3b3b971618b0d140c39cead5e2a9f6ac5272eed885649b1903c9a4d3c6ce45dcf3026a91198f4d790c5 slim-alpinelinux.tar.gz +3df74cf3c8b2e313b7f394a624c094ec144844003cdd264867a7bd9f46d6a10d9f5e818078340eef76cd52c38bc9ec11989f9dac2f5c693b674c2ec627f447a2 no-slimlock.patch +c66c3908147ec28b68577958bdd7bd4bc7c42b00fc4a7ce30162202a4d0ae18ef7c0c81ca60c661609e479b370ad30261494fe84bb4ffad48232536aec483729 libslim-underlinking.patch +22fcbdc54b1a5dc0d3501649addb8e290c63ea4a6f9d0bdbdbe9bdea1c9df785f6763f2cee2ff33e6ca2dd49c1c65fd9d036fd9527f298a7ca9e0c5acc48e854 snprintf.patch +e5f398ea58adbedea7ae40c7a907d2f926148ee6f3c51fc5761b84d1d119c091fa0cf34f908cd49300fcddea71c5c9b6f2ac21731808ce5d73ea65a65b19a55b slim.logrotate +022348a96e42bcf9454174f470c954b5a25d45250220d26010aa1b62106dc2f27a34c2e767f4f97087424b8122443095623098417a163683c54126878f1721a4 slim.initd" diff --git a/main/slim/libslim-underlinking.patch b/main/slim/libslim-underlinking.patch new file mode 100644 index 0000000000..8db24fe1e4 --- /dev/null +++ b/main/slim/libslim-underlinking.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index eb1608b..195cefd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -180,6 +180,8 @@ include_directories( + target_link_libraries(libslim + ${JPEG_LIBRARIES} + ${PNG_LIBRARIES} ++ ${X11_Xft_LIB} ++ ${X11_Xrandr_LIB} + ) + + #Set up library with all found packages for slim diff --git a/main/slim/no-slimlock.patch b/main/slim/no-slimlock.patch new file mode 100644 index 0000000000..1c728206e4 --- /dev/null +++ b/main/slim/no-slimlock.patch @@ -0,0 +1,16 @@ +Fixes building without PAM +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9892c1d..eb1608b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -222,7 +222,9 @@ endif(BUILD_SLIMLOCK) + ####### 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/main/slim/pthread.patch b/main/slim/pthread.patch deleted file mode 100644 index 1fb4852c54..0000000000 --- a/main/slim/pthread.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- ./CMakeLists.txt.orig 2013-01-02 07:56:30.920523149 +0000 -+++ ./CMakeLists.txt 2013-01-02 07:57:27.844341140 +0000 -@@ -134,6 +134,7 @@ - find_library(M_LIB m) - find_library(RT_LIB rt) - find_library(CRYPTO_LIB crypt) -+find_library(PTHREAD_LIB pthread) - - add_definitions(${SLIM_DEFINITIONS}) - -@@ -154,6 +155,7 @@ - ${M_LIB} - ${RT_LIB} - ${CRYPTO_LIB} -+ ${PTHREAD_LIB} - ${X11_X11_LIB} - ${X11_Xft_LIB} - ${X11_Xrender_LIB} diff --git a/main/slim/snprintf.patch b/main/slim/snprintf.patch new file mode 100644 index 0000000000..f534ce3fad --- /dev/null +++ b/main/slim/snprintf.patch @@ -0,0 +1,13 @@ +diff --git a/Ck.cpp b/Ck.cpp +index 3b94426..85cc022 100644 +--- a/Ck.cpp ++++ b/Ck.cpp +@@ -91,7 +91,7 @@ namespace Ck { + + vt = *((long *)return_value); + +- std::snprintf(device, 32, "/dev/tty%ld", vt); ++ snprintf(device, 32, "/dev/tty%ld", vt); + + if(return_value) + XFree(return_value); |