diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-02-12 20:55:06 +0100 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2016-02-12 20:58:59 +0100 |
| commit | cc9779c2e720252ccb4a7726a11793164c0a39bc (patch) | |
| tree | b071ed0341b2246dc180df6befdc3f9b88000ce6 /testing | |
| parent | 84d46c010d41313f36ed2ac66592c8f1aea6ae99 (diff) | |
| download | aports-cc9779c2e720252ccb4a7726a11793164c0a39bc.tar.bz2 aports-cc9779c2e720252ccb4a7726a11793164c0a39bc.tar.xz | |
testing/dwm: 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.
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/dwm/APKBUILD | 17 | ||||
| -rw-r--r-- | testing/dwm/freetypeinc.patch | 12 |
2 files changed, 8 insertions, 21 deletions
diff --git a/testing/dwm/APKBUILD b/testing/dwm/APKBUILD index da6e169e91..da5c333e7f 100644 --- a/testing/dwm/APKBUILD +++ b/testing/dwm/APKBUILD @@ -12,8 +12,7 @@ depends_dev="" makedepends="libxft-dev libx11-dev libxinerama-dev" install="" subpackages="$pkgname-doc" -source="http://dl.suckless.org/$pkgname/$pkgname-$pkgver.tar.gz - freetypeinc.patch" +source="http://dl.suckless.org/$pkgname/$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 || return 1 } -md5sums="f0b6b1093b7207f89c2a90b848c008ec dwm-6.1.tar.gz -a5ff4aa30011dfe8b0ab7d6b35a8b6eb freetypeinc.patch" -sha256sums="c2f6c56167f0acdbe3dc37cca9c1a19260c040f2d4800e3529a21ad7cce275fe dwm-6.1.tar.gz -09cad929338b4caf32a7c77fa46dd6d968019e928f010c2f61a172069cccc2be freetypeinc.patch" -sha512sums="875644bbc246088f2c87e50debbadd4bc179444b396b1b327149087e8bc5303325ebc9103a7e3c864266ee1ac683ea3cd8f0a08285c8e46fc4389d5b83a555f1 dwm-6.1.tar.gz -6705591b265120536071490d42f31a830431ad1c74a70d36f1dba4d0aa27a96338516d19507b092c2989d3116f2219fb0849e9fb3cb84c8f1db82350f8ca0adf freetypeinc.patch" +md5sums="f0b6b1093b7207f89c2a90b848c008ec dwm-6.1.tar.gz" +sha256sums="c2f6c56167f0acdbe3dc37cca9c1a19260c040f2d4800e3529a21ad7cce275fe dwm-6.1.tar.gz" +sha512sums="875644bbc246088f2c87e50debbadd4bc179444b396b1b327149087e8bc5303325ebc9103a7e3c864266ee1ac683ea3cd8f0a08285c8e46fc4389d5b83a555f1 dwm-6.1.tar.gz" diff --git a/testing/dwm/freetypeinc.patch b/testing/dwm/freetypeinc.patch deleted file mode 100644 index 3e3fff6846..0000000000 --- a/testing/dwm/freetypeinc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr dwm-6.1.orig/config.mk dwm-6.1/config.mk ---- dwm-6.1.orig/config.mk 2015-11-09 11:40:01.970911763 +0100 -+++ dwm-6.1/config.mk 2015-11-09 11:40:26.330814681 +0100 -@@ -17,8 +17,6 @@ XINERAMAFLAGS = -DXINERAMA - # freetype - FREETYPELIBS = -lfontconfig -lXft - FREETYPEINC = /usr/include/freetype2 --# OpenBSD (uncomment) --FREETYPEINC = ${X11INC}/freetype2 - - # includes and libs - INCS = -I${X11INC} -I${FREETYPEINC} |