diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-02-12 20:57:17 +0100 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-02-12 20:58:59 +0100 |
| commit | 7938b12c08a43683c6e025408edceac28b18d7b4 (patch) | |
| tree | 72e5f7be384ae8be23443870f881a8b8e9ecc62a | |
| parent | cc9779c2e720252ccb4a7726a11793164c0a39bc (diff) | |
| download | aports-7938b12c08a43683c6e025408edceac28b18d7b4.tar.bz2 aports-7938b12c08a43683c6e025408edceac28b18d7b4.tar.xz | |
main/dmenu: don't patch the config.mk file
Instead simply set the environment variables by hand. No pkgrel bump
since it should result in an identical binary.
| -rw-r--r-- | main/dmenu/APKBUILD | 17 | ||||
| -rw-r--r-- | main/dmenu/freetypeinc.patch | 12 |
2 files changed, 8 insertions, 21 deletions
diff --git a/main/dmenu/APKBUILD b/main/dmenu/APKBUILD index 9ff394ae4d..8368a624b4 100644 --- a/main/dmenu/APKBUILD +++ b/main/dmenu/APKBUILD @@ -12,8 +12,7 @@ depends_dev="" makedepends="libx11-dev libxinerama-dev libxft-dev" install="" subpackages="$pkgname-doc" -source="http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz - freetypeinc.patch" +source="http://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver prepare() { @@ -27,7 +26,10 @@ prepare() { } build() { - make -C "$_builddir" || return 1 + make X11INC=/usr/include/X11 \ + X11LIB=/usr/lib/X11 \ + FREETYPEINC=/usr/include/freetype2 \ + -C "$_builddir" || return 1 } package() { @@ -35,9 +37,6 @@ package() { -C "$_builddir" install } -md5sums="6fedf081133bc0725cb040b3b8ac3fac dmenu-4.6.tar.gz -9b53d204b009bc23ffc22b615f719eb3 freetypeinc.patch" -sha256sums="4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3 dmenu-4.6.tar.gz -6229575db4eb0e79ca8399c6eebb0e9467208f30b7ae23f578733e7442a942b8 freetypeinc.patch" -sha512sums="e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3 dmenu-4.6.tar.gz -607485a9e1a8c338255ecbf9fc22db6560f40c3692f80b43a89517e34b4819386d1c91c58346e6dc46f1c393c4d888e0012cf374f803e04ab381010bedb08647 freetypeinc.patch" +md5sums="6fedf081133bc0725cb040b3b8ac3fac dmenu-4.6.tar.gz" +sha256sums="4a7a24008a621c3cd656155ad91ab8136db8f0d3b9ec56dafeec518cabda96b3 dmenu-4.6.tar.gz" +sha512sums="e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3 dmenu-4.6.tar.gz" diff --git a/main/dmenu/freetypeinc.patch b/main/dmenu/freetypeinc.patch deleted file mode 100644 index 758a58d40f..0000000000 --- a/main/dmenu/freetypeinc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr dmenu-4.6.orig/config.mk dmenu-4.6/config.mk ---- dmenu-4.6.orig/config.mk 2015-11-09 11:55:46.363880396 +0100 -+++ dmenu-4.6/config.mk 2015-11-09 11:55:57.450509604 +0100 -@@ -15,8 +15,6 @@ XINERAMAFLAGS = -DXINERAMA - # freetype - FREETYPELIBS = -lfontconfig -lXft - FREETYPEINC = /usr/include/freetype2 --# OpenBSD (uncomment) --FREETYPEINC = ${X11INC}/freetype2 - - # includes and libs - INCS = -I${X11INC} -I${FREETYPEINC} |