diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-12-18 17:45:03 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-12-18 17:45:03 +0000 |
| commit | 94749d466a1c060165299ede44ebf640c99b162a (patch) | |
| tree | 3025a0b7e6104469f31790e9b09d299d1c00f7fb /main | |
| parent | a1260bcc1f82fab029c81a041e0638b44a2f0139 (diff) | |
| download | aports-94749d466a1c060165299ede44ebf640c99b162a.tar.bz2 aports-94749d466a1c060165299ede44ebf640c99b162a.tar.xz | |
main/slim: fix freetype2 header dirs, and musl build
Diffstat (limited to 'main')
| -rw-r--r-- | main/slim/APKBUILD | 10 | ||||
| -rw-r--r-- | main/slim/musl-includes.patch | 10 | ||||
| -rw-r--r-- | main/slim/slim-freetype-dirs.patch | 11 |
3 files changed, 30 insertions, 1 deletions
diff --git a/main/slim/APKBUILD b/main/slim/APKBUILD index 5e0b6a4b98..99cd0c51c6 100644 --- a/main/slim/APKBUILD +++ b/main/slim/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=slim pkgver=1.3.6 -pkgrel=0 +pkgrel=1 pkgdesc="Desktop-independent graphical login manager for X11" url="http://slim.berlios.de/" arch="all" @@ -15,7 +15,9 @@ source="http://download.berlios.de/$pkgname/$pkgname-$pkgver.tar.gz http://dev.alpinelinux.org/~ncopa/alpine/slim-alpinelinux.tar.gz no-slimlock.patch libslim-underlinking.patch + slim-freetype-dirs.patch snprintf.patch + musl-includes.patch $pkgname.logrotate $pkgname.initd " @@ -76,20 +78,26 @@ md5sums="d40d256394f9ef34cef34d2aa9cb52e6 slim-1.3.6.tar.gz cd63232c7770b0e67a009a94c2a46b82 slim-alpinelinux.tar.gz b443d1a03f767fcb1fe33a10a532cef0 no-slimlock.patch 348be5e6570881f601b68c3ba2f7bbed libslim-underlinking.patch +da8a6a6320dfb9bc7dad46e165c68d60 slim-freetype-dirs.patch 111e3a5f1e5e3d71f2c75f20a285932b snprintf.patch +f39b25e4191afaa91f7d415905de8932 musl-includes.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 +f808e0fd22c0a31ec3b8bb4493aa131a73118a5da419bbc5cc33e43635652bd6 slim-freetype-dirs.patch ef1fac57a57dfb696db110c8741c0902dd84bac50f516f52d0ee0c8bd4133d5d snprintf.patch +fdccc8f2cfc225db1b7b57aa4e9ab00784d79f906d4b61043a724e164c4faa98 musl-includes.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 +1f957eadb586b8f0523a2cf6ea550280a542500de925383a06d658424c524a4ef5b148aa9150a9f045529c896fe69c013417b9883583acc12a7a656b7202eded slim-freetype-dirs.patch 22fcbdc54b1a5dc0d3501649addb8e290c63ea4a6f9d0bdbdbe9bdea1c9df785f6763f2cee2ff33e6ca2dd49c1c65fd9d036fd9527f298a7ca9e0c5acc48e854 snprintf.patch +bf1f44814dcf220b91eef8cd766c7eb3b2c2667a211d1206f3e57b88e5e7fbe17ea1e7b3c7c231cb52356b6c7df650af94759b1c154a8dd7d95dc45a9aec0e86 musl-includes.patch e5f398ea58adbedea7ae40c7a907d2f926148ee6f3c51fc5761b84d1d119c091fa0cf34f908cd49300fcddea71c5c9b6f2ac21731808ce5d73ea65a65b19a55b slim.logrotate 022348a96e42bcf9454174f470c954b5a25d45250220d26010aa1b62106dc2f27a34c2e767f4f97087424b8122443095623098417a163683c54126878f1721a4 slim.initd" diff --git a/main/slim/musl-includes.patch b/main/slim/musl-includes.patch new file mode 100644 index 0000000000..995417eb8e --- /dev/null +++ b/main/slim/musl-includes.patch @@ -0,0 +1,10 @@ +--- slim-1.3.6.orig/panel.cpp ++++ slim-1.3.6/panel.cpp +@@ -11,6 +11,7 @@ + + #include <sstream> + #include <poll.h> ++#include <libgen.h> + #include <X11/extensions/Xrandr.h> + #include "panel.h" + diff --git a/main/slim/slim-freetype-dirs.patch b/main/slim/slim-freetype-dirs.patch new file mode 100644 index 0000000000..7379a4cabc --- /dev/null +++ b/main/slim/slim-freetype-dirs.patch @@ -0,0 +1,11 @@ +--- slim-1.3.6.orig/CMakeLists.txt ++++ slim-1.3.6/CMakeLists.txt +@@ -170,7 +170,7 @@ + ${X11_Xft_INCLUDE_PATH} + ${X11_Xrender_INCLUDE_PATH} + ${X11_Xrandr_INCLUDE_PATH} +- ${FREETYPE_INCLUDE_DIR_freetype2} ++ ${FREETYPE_INCLUDE_DIRS} + ${X11_Xmu_INCLUDE_PATH} + ${ZLIB_INCLUDE_DIR} + ${JPEG_INCLUDE_DIR} |