From 8082faa3458759b9d013657719ed365329add680 Mon Sep 17 00:00:00 2001 From: Michael Weber Date: Sun, 22 Mar 2015 00:11:09 +0000 Subject: [PATCH] Version bump (bug 543846). Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x62EEF090 --- dev-libs/libnsfb/ChangeLog | 13 ++- dev-libs/libnsfb/Manifest | 22 ++-- .../files/libnsfb-0.0.2-autodetect.patch | 33 ------ .../libnsfb/files/libnsfb-0.0.2-unused.patch | 19 ---- .../libnsfb/files/libnsfb-0.0.2-xcb-fix.patch | 105 ------------------ .../files/libnsfb-0.1.3-glibc2.20.patch | 19 ++++ dev-libs/libnsfb/libnsfb-0.0.2.ebuild | 91 --------------- ...nsfb-0.1.0.ebuild => libnsfb-0.1.3.ebuild} | 20 +++- 8 files changed, 56 insertions(+), 266 deletions(-) delete mode 100644 dev-libs/libnsfb/files/libnsfb-0.0.2-autodetect.patch delete mode 100644 dev-libs/libnsfb/files/libnsfb-0.0.2-unused.patch delete mode 100644 dev-libs/libnsfb/files/libnsfb-0.0.2-xcb-fix.patch create mode 100644 dev-libs/libnsfb/files/libnsfb-0.1.3-glibc2.20.patch delete mode 100644 dev-libs/libnsfb/libnsfb-0.0.2.ebuild rename dev-libs/libnsfb/{libnsfb-0.1.0.ebuild => libnsfb-0.1.3.ebuild} (70%) diff --git a/dev-libs/libnsfb/ChangeLog b/dev-libs/libnsfb/ChangeLog index 55694b82fade..b5aa21d5bdb1 100644 --- a/dev-libs/libnsfb/ChangeLog +++ b/dev-libs/libnsfb/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-libs/libnsfb -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v 1.12 2014/11/18 13:51:26 xmw Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/ChangeLog,v 1.13 2015/03/22 00:11:05 xmw Exp $ + +*libnsfb-0.1.3 (22 Mar 2015) + + 22 Mar 2015; Michael Weber + +files/libnsfb-0.1.3-glibc2.20.patch, +libnsfb-0.1.3.ebuild, + -files/libnsfb-0.0.2-autodetect.patch, -files/libnsfb-0.0.2-unused.patch, + -files/libnsfb-0.0.2-xcb-fix.patch, -libnsfb-0.0.2.ebuild, + -libnsfb-0.1.0.ebuild: + Version bump (bug 543846). 18 Nov 2014; Michael Weber +files/libnsfb-0.1.2-glibc2.20.patch, libnsfb-0.1.2.ebuild: diff --git a/dev-libs/libnsfb/Manifest b/dev-libs/libnsfb/Manifest index ca2320916aee..b34bfc9da2e4 100644 --- a/dev-libs/libnsfb/Manifest +++ b/dev-libs/libnsfb/Manifest @@ -1,27 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX libnsfb-0.0.2-autodetect.patch 923 SHA256 5289cdc9604e3c244b95090a68be07a02f338e9d6124dea55cc90d12eefbf0ec SHA512 4b8b508edb274307e9dfb89633da2abac90f00b1667a8a82e051e097f0eee46b6efa921b2fed1806bbc7b0cf857e58c65a657758296baae644a45a8b1bfe30fd WHIRLPOOL eefa1ff9f33df47e2aea65230c5280df9bd2e0dcbe85b4a8a690a465fb3b420cdfb5bc9d8c201286b8dfd5d7555184c25bfaf4954d0c9bf74b643345fd6ac321 -AUX libnsfb-0.0.2-unused.patch 501 SHA256 c483458efa08ad0a221732e551f4e202ce9f437d32da068057f5d70d174aa1dd SHA512 d7a707cd1c6273a6dffa8b211dc73563b5b166ca16f86b9341b68caf58907483be4e45faa26e41a432f4868555d6bc065146ada47c74f50fc3bc6057240b95ba WHIRLPOOL d77ba358da7e8fb168248966dec53b26e72f566ecd57c6f1b9e72a5c446e0536fc37f6741f8dd1ad920695098edaddcaa39b689e9bf92239c2553e479154ece7 -AUX libnsfb-0.0.2-xcb-fix.patch 3674 SHA256 e90bb142f69a149df05357f215570f8107ea5d2858560ce3428ee5952ac334ea SHA512 135aaa1f600a8322454fe07234258f725eaf383e2a6e3cb5cca774e79b113423afd9110ad403f363c93bafccc8132a18550bbc983904e8eb712b7fd2e2a6f7bf WHIRLPOOL 5da96e647ec0ef77fd2669f03474390090a7c3921e3bddf5b16d1d9ef6812f6b8b58ba871b8f14f03e653be6fdffbd3aa796990f0d76ef9b27825f4b21cf5955 AUX libnsfb-0.1.0-autodetect.patch 734 SHA256 b5081541a30d28128863020c28d1a42e7645b5985fe780524b52ef3d18b626da SHA512 72f3af574fadf38a514a6f6d4d24246ad1e76d9c9daa9700f0b37cb465f7afd4e4d7fdde6e53657740db3a6f87f1e8bfaeb1b008c43462d67f224c728af98993 WHIRLPOOL 15ef7180aa4f20377ba05a8f3cf8947e09c5d4dbfcd5b503e0a1d48ee85dfe6e215c7e02906a8addbe4cb4f7a153806efe9aeeb542c17feb170cdcb89847c5bd AUX libnsfb-0.1.2-glibc2.20.patch 523 SHA256 429b403fcc446ac537f80202229b07f99cad102e5bb56220574124ff63091ec7 SHA512 d30a4e49b9ee55823c5a70aab27d78dd8438567cb665c47e15fa138f4f9fba7e519ed6511b3102dc9665804701714e4034d0a8e08bfa9d49a38a4c2f64198cfc WHIRLPOOL f70a5e6bbc13aebc4503c45cd2f29dc242a65ff790945eacf329408601f7e760ac8a3d9bbe216643eb47474b498d4710213edac51142cb2702e562ae207402bc -DIST libnsfb-0.1.0-src.tar.gz 79021 SHA256 edda51ae23237bb9bda2ff4ea29b4502e7c8f5ca9356bac27c6a03a8a18deba7 SHA512 3360b78261b99fafa06db6153df86a16e5b2161d8b1a85f395a9ee4493f2734ab1c80a6db92dd44b438dd3e39c40fc3f730854035f4effe7707ed349e2175cb6 WHIRLPOOL 54f5051f494800f6fd890729a99396d172ed762a58e49485c430cae2afd1aade9f93312dd883f8725ce6af6a0094f0a3240ff6c80604b8152b1bf653c972a3c3 +AUX libnsfb-0.1.3-glibc2.20.patch 766 SHA256 81565a5133322670d9178ad051982430b1086bf2ec193b0c322f72d6970de47c SHA512 1e25c70f4445c98880887b1147cc85338ba9eb7863b4a6607054ffd9b154dfe6c74aa07e37ac90c2e832ca9a94c8834f2d3619dce5bb4afa629c1c321b3b6e06 WHIRLPOOL 075d4b250de0bf60aa01ea712a86c94ce6b17a72d5603e081965e5080886a09a9f5864d1a1f4a9cb5192f13af90f9c4f07ebbf144ef04cdaac8ba0e5410a4c94 DIST libnsfb-0.1.2-src.tar.gz 80675 SHA256 b42596e990d94a76983ff35b645a2d0a01e44651e08eb42712f72a91fed312dd SHA512 a739fe4f0ed45c44f57e432d1d8dc4d4a4ed943ce0cae269b6f2761f3cd75cf5d2f364c923aeeaad0da8eb8e9d9e8d7b558fac55627d915c8eb6c76c69e999b5 WHIRLPOOL 94f0eac12bd944582cd6116ecba2df9196d0a9f985e03fcefa7285cacc07cf378e6465efe9799c0d631d600d8880685e303562d9d0f4b801aa9ec62c8eeb0dc3 -DIST netsurf-2.9-full-src.tar.gz 4621932 SHA256 ade6ade7f66ce2f0a80df724bafefd18c17165166111c490837737aa2e09ae9d SHA512 8dfd4d845f5255ee4420c6d4454594eb34dda129096b4d6acb72bd00e976042e7caf80b075ed39d3d3bf3b070c297f73f889075200bd7fb3d2467ca8154c07f0 WHIRLPOOL dfd1151d1c92cf374f5223113328c43f12537c4bc9b17caa831fb5c1febbf70a27766f20bf333867e5104bb03b1cd39f02eed0d351ceec901f922b759d7b330b -DIST netsurf-buildsystem-1.0.tar.gz 37026 SHA256 4495e8e12faf0ace668ab80401064ce7f65a195efe63c924c066a109649ff146 SHA512 763e10766ab16be375c40a226e36a95df5740ac62b5bbc4eb6d52693b83284d2e71d9a3d797f55c28853a5d2565182759ffa9bfb3d736daf21b347f418661c47 WHIRLPOOL a65d53424a34a796a1f85ed5d4a9ca9bf58eaba7246e5ea20bc7da09e0e8ab60e156ce47da521660d5567c6358fda0da744e56ccf52cda6e0db92b19a6055d38 +DIST libnsfb-0.1.3-src.tar.gz 80899 SHA256 52752d0dcc251b301b9cff2eaae75ee3ad56adaf90675857bbad39254de81e3e SHA512 02bbce8f026930418d9908775ded49dda9d7facdfaf8b633d021e4d101d96d6b5f2703242e17e96a3ffe3cf2eb8b6ce11cfc4b605ec612fb59586e0590d1441d WHIRLPOOL 3033412582f3fcee75d941461361ed8b8f17101e6fe4b8b9a11a48fa7666c0c76ced629c3ac9dff038d9e6ff8f7d99092684c66359b340a04a4c2a8d3b702d5a DIST netsurf-buildsystem-1.2.tar.gz 38914 SHA256 3903a4a1551c9c202e1d2047344c4f3598c8d9d6c35ebf8cc2e18874bd0c9d61 SHA512 963e8a5033e8ef70595507f24fea3d9697eefb50ad7f92a6d3c913501c7026f12ec6d48f92b75e352b32f212f6216b8d8455aff25fa8d8d0fc12a3b19a875a1c WHIRLPOOL e56a520ae284089d0f36f06a6891ebb5b208ca847c74340c18581340e457c20ae9365999dc13284f438b965dcd7e85f04b93d1c1f22cadf6f7c1e2cef81d528c -EBUILD libnsfb-0.0.2.ebuild 2251 SHA256 099bae4c97777f7986f3c6c13e7f5a767821c5b734db723a66e84c870d77df54 SHA512 3027433c2ba7656a591b1bac9c21257ba387b9558d16bb39bec1ec7ed8228eca70c3203ba32618374a97602a0966397eda82b69a0595d20006ace638b9647786 WHIRLPOOL 486b433e8554d7f87c689c878d76eb2eae8d985b77beda5df0ea0de8ef62d571ed635a249c76531492a758a9a45c3627b0babd2d77901677b3b3ece3f4aaf115 -EBUILD libnsfb-0.1.0.ebuild 1039 SHA256 193dab062a4eee99c79f92000ce84d1f42dfca6bbdd96ea2418c8b17b330183f SHA512 a549fda1aa365d1e4036507c185d9d5ccfaf913dd890f8532349eb569fe1121a570ec83365216ae8d7eadc0a738468dd649d8bdca2784d7b1fd815d026380d3c WHIRLPOOL 31c78618eea55e333c9a70396ec3f6da807b0b390143f738de622a35dc68c806c0ced0e12b9e037f6db037115eac0f87db92ec9c8888030deb51af55c69b1c05 +DIST netsurf-buildsystem-1.3.tar.gz 37906 SHA256 10bbe95ba07476208da6047bd3c74685b6e61ba9904975b5d5c9a2c79a84ac79 SHA512 79ef3e366c4798dbb88021fd05019ba9fe50539b7482bd3d07422f4c0dbf2047b906f39a0b48deebbdf111d84d93a9364d08e5c97f91609363c27641db15e6b5 WHIRLPOOL c8131d0ffb79b208b63bef94606735968584edfff8cb24b4c83cd747c5d65c2811004626840798047ffddf84556ef7d8e23242f60d01a4a046323df3c78b0980 EBUILD libnsfb-0.1.2.ebuild 1274 SHA256 f37a086d2fde2c3d2800102b07b4ae190bb4d239f63d4ce2b1378f523004b4ce SHA512 79bc50adeb3de3a4da3653accd358f3d8fe36068881c537f3ae98a5a4a1833934269dca72eb5d8fa2e8c0c6b0cdab5c0017ebba77263b8d893e25a27f46eaa3a WHIRLPOOL da93e990e1a17872892551f9e2add6b303e858004b70593da6a7a3bef677fab4041ded46649268ee97e9be4d3ac6247a9f4c5cff53e6f081612ed9beee2dc087 -MISC ChangeLog 2305 SHA256 1f4316904f3751cf3819660da08644f51c0444dfb47cdad6d04fa7886b1d7aff SHA512 a789294b80d55e5ee31e3861dcaa70faa6aad71f12baf7a8b0a22f6c82fd884198c44ce1cffff9f8f00eef2ba2afd16ba79a3c9d01134fbf504e3968fb2e3666 WHIRLPOOL 6257521f5bd3ff82c9f35bb465052e62b35a6ff34c35b28f82cfd9a8d94d506ada1dea640fe5cee2d20865b27bc5c9ceefe62641ce5d43278790b7a5477c1d42 +EBUILD libnsfb-0.1.3.ebuild 1274 SHA256 05fd471acdabd3cc86fcab36377ac962ecd9f0d881d3b038a8efb25ad67bdd37 SHA512 712a95e0286ec733951950f55babc4cb7886a11c39206150088fff1c97cc8ce9bf678c730cdc69771db6de6ebd0c4d3040217f8654d29f37da8f4f52b034c62a WHIRLPOOL 2ba622564cd9d474cbe980d5cf99dcf8afdcb3182926d95176e2f9d42667744e93110402fa2866683532c802d0c8442c020d280e5fa36b6c88426763f667ef14 +MISC ChangeLog 2636 SHA256 cba1f03d4292b0d5c9385864131f9c065981898eeedbba71d621ddbb2cf7fc71 SHA512 afea70a393de2727f3dbf4936d29099b54f6e1ca3870c5ea574fdd20b2b90aefea61beb8345c998570a5e9adf4f5a7a8ed9e6f9df1d62ff568ec3f2985f580b6 WHIRLPOOL 386fbe8641256ccfbc748f8482eafad283fe1c7df194642016f529445b6589d7452ace05a41c0b0cf120e124e09e3c6136aff48d711f5b40c0949927226e7f79 MISC metadata.xml 224 SHA256 f810c6de744adceee241992d3f713142db3e7025986f6cc5898cfe3c9cb2f4a7 SHA512 4f78d959809ec0db2f9be2a7747d572fa8ee03d177044dd46574881a6ee83736510b76062c12daecae609282d197ba466e8a3e3a654b1383e04c659acd41bef5 WHIRLPOOL 0300a228d371c918b051bc24859dfe4e5d0d2a71b80f697f202749c5aca69efcee4be6e69454c9abfa4ced28e19a9d1f71d6d7eaf54290b8d03b5c04fd209868 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iL4EAREIAGYFAlRrTuZfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl +iL4EAREIAGYFAlUOCJ1fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl bnBncC5maWZ0aGhvcnNlbWFuLm5ldDY3QjA4MzdGODg1NUMxMjIzNUQ0MDgxNzky -N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JDk7QD/QyQ6EvRyfXGe7xyHBxvKWi7U -BcU8tNgmsWTOewHaRyoA/067ntCpdZxPyVcByM05YcAFqZ4AqwwrGM0EK83p8rVh -=qir0 +N0FERDBDNjJFRUYwOTAACgkQknrdDGLu8JBFUQEAkQEv7q0j9nge1z/P4f2A7YNo +7AVsYczk9F4xSzPpqoIA/2FBmfVzvfYDhbYaXpwXDtauRGv3AT1VWDtld/AB1ET+ +=hoQt -----END PGP SIGNATURE----- diff --git a/dev-libs/libnsfb/files/libnsfb-0.0.2-autodetect.patch b/dev-libs/libnsfb/files/libnsfb-0.0.2-autodetect.patch deleted file mode 100644 index 86b1d032529e..000000000000 --- a/dev-libs/libnsfb/files/libnsfb-0.0.2-autodetect.patch +++ /dev/null @@ -1,33 +0,0 @@ -Michael Weber https://bugs.gentoo.org/458978 - ---- libnsfb-0.0.2/Makefile -+++ libnsfb-0.0.2/Makefile -@@ -20,9 +20,17 @@ - - NSFB_XCB_PKG_NAMES := xcb xcb-icccm xcb-image xcb-keysyms - -+ifndef NSFB_VNC_AVAILABLE - $(eval $(call pkg_config_package_available,NSFB_VNC_AVAILABLE,libvncserver)) -+endif -+ -+ifndef NSFB_SDL_AVAILABLE - $(eval $(call pkg_config_package_available,NSFB_SDL_AVAILABLE,sdl)) -+endif -+ -+ifndef NSFB_XCB_AVAILABLE - $(eval $(call pkg_config_package_available,NSFB_XCB_AVAILABLE,$(NSFB_XCB_PKG_NAMES))) -+endif - - ifeq ($(NSFB_SDL_AVAILABLE),yes) - $(eval $(call pkg_config_package_add_flags,sdl,CFLAGS)) -@@ -63,7 +71,10 @@ - - REQUIRED_PKGS := $(REQUIRED_PKGS) $(NSFB_XCB_PKG_NAMES) - -+ ifndef NSFB_XCB_UTIL_AVAILABLE - $(eval $(call pkg_config_package_available,NSFB_XCB_UTIL_AVAILABLE,xcb-util)) -+ endif -+ - ifeq ($(NSFB_XCB_UTIL_AVAILABLE),yes) - REQUIRED_PKGS := $(REQUIRED_PKGS) xcb-util - endif diff --git a/dev-libs/libnsfb/files/libnsfb-0.0.2-unused.patch b/dev-libs/libnsfb/files/libnsfb-0.0.2-unused.patch deleted file mode 100644 index 16da804f9809..000000000000 --- a/dev-libs/libnsfb/files/libnsfb-0.0.2-unused.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- libnsfb-0.0.2/src/surface/vnc.c -+++ libnsfb-0.0.2/src/surface/vnc.c -@@ -486,7 +486,6 @@ - static bool vnc_input(nsfb_t *nsfb, nsfb_event_t *event, int timeout) - { - rfbScreenInfoPtr vncscreen = nsfb->surface_priv; -- int ret; - - if (vncscreen != NULL) { - -@@ -496,7 +495,7 @@ - event->type = NSFB_EVENT_CONTROL; - event->value.controlcode = NSFB_CONTROL_TIMEOUT; - -- ret = rfbProcessEvents(vncscreen, timeout * 1000); -+ rfbProcessEvents(vncscreen, timeout * 1000); - return true; - } - diff --git a/dev-libs/libnsfb/files/libnsfb-0.0.2-xcb-fix.patch b/dev-libs/libnsfb/files/libnsfb-0.0.2-xcb-fix.patch deleted file mode 100644 index 40c21eb7d497..000000000000 --- a/dev-libs/libnsfb/files/libnsfb-0.0.2-xcb-fix.patch +++ /dev/null @@ -1,105 +0,0 @@ -From http://patch-tracker.debian.org/package/netsurf/2.9-2 - ---- libnsfb-0.0.2/Makefile -+++ libnsfb-0.0.2/Makefile -@@ -32,16 +32,41 @@ - endif - - ifeq ($(NSFB_XCB_AVAILABLE),yes) -- $(eval $(call pkg_config_package_min_version,NSFB_XCB_NEW_API,xcb,0.23)) -+ # Size hint allocators were removed in xcb-icccm 0.3.0 -+ $(eval $(call pkg_config_package_min_version,NSFB_XCB_ICCCM_SIZE_HINTS,xcb-icccm,0.3.0)) -+ ifeq ($(NSFB_XCB_ICCCM_SIZE_HINTS),yes) -+ CFLAGS := $(CFLAGS) -DNSFB_NEED_HINTS_ALLOC -+ endif -+ -+ # xcb-icccm 0.3.8 introduced an additional "icccm_" in function names -+ $(eval $(call pkg_config_package_min_version,NSFB_XCB_ICCCM_API_PREFIX,xcb-icccm,0.3.8)) -+ ifeq ($(NSFB_XCB_ICCCM_API_PREFIX),yes) -+ CFLAGS := $(CFLAGS) -DNSFB_NEED_ICCCM_API_PREFIX -+ endif - -- ifeq ($(NSFB_XCB_NEW_API),yes) -- CFLAGS := $(CFLAGS) -DNEED_HINTS_ALLOC -+ # xcbproto 1.6 incorporated atoms previously found in xcb_atom -+ # However, libxcb <1.3 did not report xcbproto versions. Assume xcbproto 1.5 in this case. -+ $(eval $(call pkg_config_package_min_version,NSFB_HAVE_MODERN_XCB,xcb,1.3)) -+ ifeq ($(NSFB_HAVE_MODERN_XCB),yes) -+ $(eval $(call pkg_config_get_variable,NSFB_XCBPROTO_VERSION,xcb,xcbproto_version)) -+ NSFB_XCBPROTO_MAJOR_VERSION := $(word 1,$(subst ., ,$(NSFB_XCBPROTO_VERSION))) -+ NSFB_XCBPROTO_MINOR_VERSION := $(word 2,$(subst ., ,$(NSFB_XCBPROTO_VERSION))) -+ CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MAJOR_VERSION=$(NSFB_XCBPROTO_MAJOR_VERSION) -+ CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MINOR_VERSION=$(NSFB_XCBPROTO_MINOR_VERSION) -+ else -+ CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MAJOR_VERSION=1 -+ CFLAGS := $(CFLAGS) -DNSFB_XCBPROTO_MINOR_VERSION=5 - endif - - $(eval $(call pkg_config_package_add_flags,$(NSFB_XCB_PKG_NAMES),CFLAGS)) - $(eval $(call pkg_config_package_add_flags,$(NSFB_XCB_PKG_NAMES),TESTCFLAGS,TESTLDFLAGS)) - - REQUIRED_PKGS := $(REQUIRED_PKGS) $(NSFB_XCB_PKG_NAMES) -+ -+ $(eval $(call pkg_config_package_available,NSFB_XCB_UTIL_AVAILABLE,xcb-util)) -+ ifeq ($(NSFB_XCB_UTIL_AVAILABLE),yes) -+ REQUIRED_PKGS := $(REQUIRED_PKGS) xcb-util -+ endif - endif - - ifeq ($(NSFB_VNC_AVAILABLE),yes) ---- libnsfb-0.0.2/src/surface/x.c -+++ libnsfb-0.0.2/src/surface/x.c -@@ -33,7 +33,7 @@ - #include "plot.h" - #include "cursor.h" - --#if defined(NEED_HINTS_ALLOC) -+#if defined(NSFB_NEED_HINTS_ALLOC) - static xcb_size_hints_t * - xcb_alloc_size_hints(void) - { -@@ -47,6 +47,17 @@ - } - #endif - -+#if defined(NSFB_NEED_ICCCM_API_PREFIX) -+#define xcb_size_hints_set_max_size xcb_icccm_size_hints_set_max_size -+#define xcb_size_hints_set_min_size xcb_icccm_size_hints_set_min_size -+#define xcb_set_wm_size_hints xcb_icccm_set_wm_size_hints -+#endif -+ -+#if (NSFB_XCBPROTO_MAJOR_VERSION > 1) || \ -+ (NSFB_XCBPROTO_MAJOR_VERSION == 1 && NSFB_XCBPROTO_MINOR_VERSION >= 6) -+#define WM_NORMAL_HINTS XCB_ATOM_WM_NORMAL_HINTS -+#endif -+ - #define X_BUTTON_LEFT 1 - #define X_BUTTON_MIDDLE 2 - #define X_BUTTON_RIGHT 3 ---- libnsfb-0.0.2/build/makefiles/Makefile.pkgconfig -+++ libnsfb-0.0.2/build/makefiles/Makefile.pkgconfig -@@ -24,7 +24,7 @@ - $$(error pkg-config is required to auto-detect package version) - endif - -- $(1) := $$(shell $$(PKGCONFIG) --version $(2)) -+ $(1) := $$(shell $$(PKGCONFIG) --modversion $(2)) - - endef - -@@ -86,3 +86,15 @@ - - endef - -+# Obtain the value of a pkg-config variable -+# 1: Name of variable to assign result into -+# 2: Name of package to search for -+# 3: Name of pkg-config variable to retrieve -+define pkg_config_get_variable -+ ifeq ($$(PKGCONFIG),) -+ $$(error pkg-config is required to auto-detect package version) -+ endif -+ -+ $(1) := $$(shell $$(PKGCONFIG) --variable=$(3) $(2)) -+ -+endef diff --git a/dev-libs/libnsfb/files/libnsfb-0.1.3-glibc2.20.patch b/dev-libs/libnsfb/files/libnsfb-0.1.3-glibc2.20.patch new file mode 100644 index 000000000000..0c7eb7548ad4 --- /dev/null +++ b/dev-libs/libnsfb/files/libnsfb-0.1.3-glibc2.20.patch @@ -0,0 +1,19 @@ +--- libnsfb-0.1.3/Makefile ++++ libnsfb-0.1.3/Makefile +@@ -15,13 +15,13 @@ + # Toolchain flags + WARNFLAGS := -Wall -Wextra -Wundef -Wpointer-arith -Wcast-align \ + -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ +- -Wmissing-declarations -Wnested-externs -Werror ++ -Wmissing-declarations -Wnested-externs + + # would like these flags but gcc earlier than 4.4 fail + #-pedantic -Wno-overlength-strings # For nsglobe.c + +-CFLAGS := -g -std=c99 -D_BSD_SOURCE -D_POSIX_C_SOURCE=200112L \ +- -I$(CURDIR)/include/ -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS) -Wno-error ++CFLAGS := -g -std=c99 -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200112L \ ++ -I$(CURDIR)/include/ -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS) + + NSFB_XCB_PKG_NAMES := xcb xcb-icccm xcb-image xcb-keysyms xcb-atom + diff --git a/dev-libs/libnsfb/libnsfb-0.0.2.ebuild b/dev-libs/libnsfb/libnsfb-0.0.2.ebuild deleted file mode 100644 index 6598642eb595..000000000000 --- a/dev-libs/libnsfb/libnsfb-0.0.2.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-0.0.2.ebuild,v 1.3 2013/02/28 07:39:57 xmw Exp $ - -EAPI=5 - -inherit eutils multilib toolchain-funcs - -DESCRIPTION="framebuffer abstraction library, written in C" -HOMEPAGE="http://www.netsurf-browser.org/projects/libnsfb/" -SRC_URI="http://download.netsurf-browser.org/netsurf/releases/source-full/netsurf-2.9-full-src.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm" -IUSE="debug sdl static-libs vnc xcb" - -RDEPEND="sdl? ( media-libs/libsdl ) - vnc? ( net-libs/libvncserver ) - xcb? ( x11-libs/libxcb - x11-libs/xcb-util - x11-libs/xcb-util-image - x11-libs/xcb-util-keysyms )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -# we don't allow access to /dev/fb0 -RESTRICT="test" - -pkg_setup(){ - netsurf_src_prepare() { - sed -e "/^CCOPT :=/s:=.*:=:" \ - -e "/^CCNOOPT :=/s:=.*:=:" \ - -e "/^CCDBG :=/s:=.*:=:" \ - -i build/makefiles/Makefile.{gcc,clang} - sed -e "/^INSTALL_ITEMS/s: /lib: /$(get_libdir):g" \ - -i Makefile || die - sed -e "/^libdir/s:/lib:/$(get_libdir):g" \ - -i ${NETSURF_PKGCONFIG:-${PN}}.pc.in || die - } - netsurf_src_configure() { - echo "Q := " >> Makefile.config - echo "CC := $(tc-getCC)" >> Makefile.config - echo "AR := $(tc-getAR)" >> Makefile.config - } - - netsurf_make() { - emake COMPONENT_TYPE=lib-shared BUILD=$(usex debug debug release) "$@" - use static-libs && \ - emake COMPONENT_TYPE=lib-static BUILD=$(usex debug debug release) "$@" - } -} - -src_unpack() { - default - mv netsurf-2.9/${P} . || die - rm -r netsurf-2.9 || die -} - -src_prepare() { - #backported from vcs - epatch "${FILESDIR}"/${P}-xcb-fix.patch - - epatch "${FILESDIR}"/${P}-unused.patch - epatch "${FILESDIR}"/${P}-autodetect.patch - - netsurf_src_prepare -} - -src_configure() { - netsurf_src_configure - - echo "NSFB_SDL_AVAILABLE := $(usex sdl)" >> Makefile.config - echo "NSFB_VNC_AVAILABLE := $(usex vnc)" >> Makefile.config - echo "NSFB_XCB_AVAILABLE := $(usex xcb)" >> Makefile.config - echo "NSFB_XCB_UTIL_AVAILABLE := $(usex xcb)" >> Makefile.config -} - -src_compile() { - netsurf_make -} - -src_test() { - netsurf_make test -} - -src_install() { - netsurf_make DESTDIR="${D}" PREFIX=/usr install - - dodoc usage -} diff --git a/dev-libs/libnsfb/libnsfb-0.1.0.ebuild b/dev-libs/libnsfb/libnsfb-0.1.3.ebuild similarity index 70% rename from dev-libs/libnsfb/libnsfb-0.1.0.ebuild rename to dev-libs/libnsfb/libnsfb-0.1.3.ebuild index 1ac85d1040c5..e77af3282d64 100644 --- a/dev-libs/libnsfb/libnsfb-0.1.0.ebuild +++ b/dev-libs/libnsfb/libnsfb-0.1.3.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-0.1.0.ebuild,v 1.4 2014/06/18 19:13:01 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnsfb/libnsfb-0.1.3.ebuild,v 1.1 2015/03/22 00:11:05 xmw Exp $ EAPI=5 +NETSURF_BUILDSYSTEM=buildsystem-1.3 inherit netsurf DESCRIPTION="framebuffer abstraction library, written in C" @@ -23,5 +24,18 @@ RDEPEND="sdl? ( >=media-libs/libsdl-1.2.15-r4[static-libs?,${MULTILIB_USEDEP}] ) >=x11-libs/xcb-util-keysyms-0.3.9-r1[static-libs?,${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" -PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch ) +PATCHES=( "${FILESDIR}"/${PN}-0.1.0-autodetect.patch + "${FILESDIR}"/${P}-glibc2.20.patch ) + DOCS=( usage ) + +src_configure() { + netsurf_src_configure + + netsurf_makeconf+=( + WITH_VNC=$(usex vnc) + WITH_SDL=$(usex sdl) + WITH_XCB=$(usex xcb) + WITH_WLD=$(usex wayland) + ) +} -- 2.26.2