diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-04-28 20:02:04 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-04-28 20:02:04 +0100 |
| commit | a4e2a46beb5e4858ef27bdedbb0ff6d2ced430ad (patch) | |
| tree | 852c90a4bf354c30ea66504f70bfab5401fba18d /x11-misc/dmenu | |
| parent | 5e8702bcbbed438e6c6cce023e7ef0cc9baa3e02 (diff) | |
gentoo resync : 28.04.2018
Diffstat (limited to 'x11-misc/dmenu')
| -rw-r--r-- | x11-misc/dmenu/Manifest | 4 | ||||
| -rw-r--r-- | x11-misc/dmenu/dmenu-9999.ebuild | 21 | ||||
| -rw-r--r-- | x11-misc/dmenu/files/dmenu-9999-gentoo.patch | 38 |
3 files changed, 20 insertions, 43 deletions
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest index 10a0b79d2fa3..968d285f1c9a 100644 --- a/x11-misc/dmenu/Manifest +++ b/x11-misc/dmenu/Manifest @@ -1,11 +1,11 @@ AUX dmenu-4.6-gentoo.patch 1134 BLAKE2B 4df80fcec2f35777ff25e0600798e1101bcc7f1c9cbbe45b59bd88cef6290d119ba45f9a53f5a54bbc9240440807fffe6a5a3400e3cfc6042651a26de5ef11cc SHA512 50e236783df1d27f3968c182a32689ddc33c45cce5c9dad91e8a2d1e1515b2e03113d0f2b9c67b0d239625198f35918b46bebeb6454ae7c2649c58b5943d4481 AUX dmenu-4.7-gentoo.patch 1153 BLAKE2B eebeac590f6fd759a5524c2613419ef65ddc6f9c4b3f8c24ed9e734a244ae14c8787dbd67c1a6d8d4d94f09f8b6cd73f2672dd321761beba82e7425086f1479c SHA512 14e286b582895985403babc6084b096075f759e0e4a8acf231508cbf4fd5a70e95638f9f99aa35bef72e656b85642bb088f5b4052d703a2b852a787902b23e27 -AUX dmenu-9999-gentoo.patch 1039 BLAKE2B 4162428ac6451475f7213da37c01eae631678791bab72f3231fe957f6a734bdc7caee88d2c349edafcaf28b99f8b8fc49358d2dfe373bdfcf0f02b1cf1bef26b SHA512 a470b8314be5c084b33060fd851def2dcd0fbea939be91b43076a1179cb34c464f978724d65f3c3ab999e7a7af0afdb130171c3cb1d942436350b869eb98262b +AUX dmenu-9999-gentoo.patch 564 BLAKE2B bd1d71e7e234c00a6d8b2f099b50e04fa6ba848ccd9f97e24adb69711b316a52b08632c8bdec94d60a1b4a5c38cda65287484a3880e57a3d5cbed06d28a36dfc SHA512 ecf1005f6d41244929de9e1f7a9486dc4359974bf763b522cab920cf13b65a26d8e12d3b1ddcf12b98e20d4007472c5fd6e240aa33892564e2c06b603c965b3a DIST dmenu-4.6.tar.gz 15057 BLAKE2B 87469e86400fc5d99c6c62666f6903c2dee6221739a52aab0facd4e417b1ddc88b138440b62e410d8230e7dec89ace1c684348eaab223fc7027eda0b6712e495 SHA512 e54fd10c0b1274eb90173aea442f0bfc496f4dda861a36d94f939e1fd835594f9aa12f3d0f90043d64e519d919b9a5273ab65012230ac022f727ee6bb64862e3 DIST dmenu-4.7.tar.gz 15597 BLAKE2B d942c541a0e76d7287c85073324b0107224256d944a87f575e02238a10f16eb62d1eee06182da91242c049e3b17fa4068be72ffd1c70f6a7bbf5a0596fe62162 SHA512 67a184f3ddb018e7b372e049052662955403e3367639b9c2284939d6f105ae74c995fe38f126d8ff75886831c8add8b50e338a1bfb0d8620b7fb1457cf88a00c DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426c1fa79a9b6253c13223ddc79413b9f8ecf38f3258aada3d7c4a91535fb930a5d2a9fb239f398a6b6af07 SHA512 fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77 EBUILD dmenu-4.6.ebuild 1304 BLAKE2B 3ee7a6e77913cb0f56cc993a53a2e0aa6db9e672492fdcba04c3a0ae37156325f4a7a872a52fd038f8065586abb6cfc41b6f0128965c48394ea7d167ced7d1a8 SHA512 7f18e03b71c1624a8e12d3afaac86471d45fbd1112474d13c3e09f32d05f08aa70104e694e467b98f22ea7174396c682e2febefa78d4104a16dc063c421a5e3f EBUILD dmenu-4.7-r1.ebuild 1363 BLAKE2B 50df42df0d21c21e021dc65b00e6631f9bd5929ac91cc456e041346dfd62c829e277a1eaf8258596d3ae42dfc2ebf86898429c1a6a2dffcf976c523efb759554 SHA512 ce758035973b61c24c01d23e96cae27e519698a2230ebd5366daf8126a7e065bbc3bc300467264c6f658042834f1fa4d46839894593c2bbd6caf3054f3fc15ac EBUILD dmenu-4.8.ebuild 1363 BLAKE2B 327c0395748865b5f653bd983aa24a4f8ae2c4938644149f3517d700c29c8187c55abb57b104202859291bfca2b878cd3db8e7d96ed6367341a4d3acd89ead41 SHA512 ef85769d84e91bcf8ebeff02b9c58d913ba6294fca1690d536cfc1f2529b66068b887a059b3b0b9c0f512be8b45e8174bcebb88a7919b9c2a8b32375da723fc4 -EBUILD dmenu-9999.ebuild 1316 BLAKE2B 2a50e97a10ac4d108afd87bd4cb84a728426fd1d864fd4baaa2b6c5c3f99b99bd7afa1f9e8ea2d861d94138daa174301a51c35ecb714c103b4d36849ae88459b SHA512 84690f28a5a3e65b933e8340d46adfe93ddc7c08f088d4af999118b1c6d13d796b1ba80c4e22507f5be0f586a66ab355c6fa193e31e1fa535c0a24f6ce52011b +EBUILD dmenu-9999.ebuild 1187 BLAKE2B 43bb2a12438cd4e0b025807cae79940d6af7b1b92ec23ec742d8a81b09c32a6907e1647fe2723924ceaeeae79250151a317e215c39bd58da4f85b249bb829e12 SHA512 90a387bb053d733ee3616d23e227e0620750fa6140e587eee2ad7516f8e97276b4660782c175cf94e23f7d06dc51a14ddcf9b0253a35b76e3a57688f04d66c03 MISC metadata.xml 361 BLAKE2B 40b663e4c351f9f6696f958b5a3006a3c18782dc2a4931584e566e2cdc2ea118f1fcef6a1ea7ad60724687e6f35bc1b25bc63351c6ffac03844ba0fb977576c8 SHA512 0be9c5e4fa1f72b02220088179c79f53e07928ee2890f78a24659e47961470d12ed7b8fe56b78ac4b493a2f42ebd491a8ebff405b013e7b7943de74892eed476 diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild index e55ea2292231..5cb15906696b 100644 --- a/x11-misc/dmenu/dmenu-9999.ebuild +++ b/x11-misc/dmenu/dmenu-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -42,16 +42,15 @@ src_prepare() { src_compile() { emake CC=$(tc-getCC) \ - "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \ - "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \ - "XINERAMAFLAGS=$( - usex xinerama "-DXINERAMA $( - $(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null - )" '' - )" \ - "XINERAMALIBS=$( - usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" '' - )" + INCS=" \ + $(usex xinerama "-DXINERAMA" '') \ + $( + $(tc-getPKG_CONFIG) --cflags fontconfig freetype2 x11 xft $(usex xinerama xinerama '') + )" \ + LIBS=" \ + $( + $(tc-getPKG_CONFIG) --libs fontconfig x11 xft $(usex xinerama xinerama '') + )" } src_install() { diff --git a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch index faeed310c886..75a1f89415ec 100644 --- a/x11-misc/dmenu/files/dmenu-9999-gentoo.patch +++ b/x11-misc/dmenu/files/dmenu-9999-gentoo.patch @@ -1,37 +1,15 @@ --- a/config.mk +++ b/config.mk -@@ -5,8 +5,8 @@ - PREFIX = /usr/local - MANPREFIX = ${PREFIX}/share/man - --X11INC = /usr/X11R6/include --X11LIB = /usr/X11R6/lib -+X11INC = -I/usr/X11R6/include -+X11LIB = -L/usr/X11R6/lib - - # Xinerama, comment if you don't want it - XINERAMALIBS = -lXinerama -@@ -14,18 +14,18 @@ - - # freetype - FREETYPELIBS = -lfontconfig -lXft --FREETYPEINC = /usr/include/freetype2 -+FREETYPEINC = -I/usr/include/freetype2 - # OpenBSD (uncomment) - #FREETYPEINC = ${X11INC}/freetype2 - - # includes and libs --INCS = -I${X11INC} -I${FREETYPEINC} --LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -+INCS = ${X11INC} ${FREETYPEINC} -+LIBS = ${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} +@@ -23,9 +23,9 @@ + LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) # flags - CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} --CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} --LDFLAGS = -s ${LIBS} -+CFLAGS = -std=c99 -pedantic -Wall ${INCS} ${CPPFLAGS} -+LDFLAGS = ${LIBS} +-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) +-CFLAGS = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS) +-LDFLAGS = -s $(LIBS) ++CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" ++CFLAGS += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS) ++LDFLAGS += $(LIBS) # compiler and linker CC = cc |