From 9403c20e10161812ed5231e7fd14464ca484aa09 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 28 Jul 2022 21:05:25 +0100 Subject: gentoo auto-resync : 28:07:2022 - 21:05:25 --- net-misc/smbc/Manifest | 5 +- .../smbc-1.2.2-multiple-definitions-gcc10.patch | 46 ++++++++++ .../smbc/files/smbc-1.2.2-samba4-includes.patch | 99 ++++++++++++++++++++++ net-misc/smbc/files/smbc-1.2.2-tinfo.patch | 18 ++++ net-misc/smbc/smbc-1.2.2-r3.ebuild | 18 ++-- 5 files changed, 180 insertions(+), 6 deletions(-) create mode 100644 net-misc/smbc/files/smbc-1.2.2-multiple-definitions-gcc10.patch create mode 100644 net-misc/smbc/files/smbc-1.2.2-samba4-includes.patch create mode 100644 net-misc/smbc/files/smbc-1.2.2-tinfo.patch (limited to 'net-misc/smbc') diff --git a/net-misc/smbc/Manifest b/net-misc/smbc/Manifest index e511dd02fa02..786b1b278732 100644 --- a/net-misc/smbc/Manifest +++ b/net-misc/smbc/Manifest @@ -1,5 +1,8 @@ AUX smbc-1.2.2-cflags.patch 323 BLAKE2B cd95f0d01e1a0f000c362544420fb55e9fed0b2786a05c2ecf90ce8066ea94c4e0e949f8b9cbdac2471ea2e5599675a51c2176c1c2a303eb3d04160d959935dc SHA512 c9cde82726e201c3a9b118ef5c34816cffc82c00b6122352797f57f5366bc8fd12d4827bcf0f895056dd8417f4ecdb48d1e607046adca62fbe2c5fd8adcc75f9 +AUX smbc-1.2.2-multiple-definitions-gcc10.patch 2191 BLAKE2B e0cb38b0799d87d78c152bd7227dd8c73e074deff608cb7ec870dc90574118f4558e6bc5c7a417a1e8154a52a9787a8873ab413c3825053c04c39b221bfedab2 SHA512 3ce7d6b76cba3abcf52a4efb2e4cc012788a3f1c182cc046a2395d3fd9f42f3d0fea49854ca02840af8eb5093684c51f973c09437957b0df6f779b258251e7ae +AUX smbc-1.2.2-samba4-includes.patch 2402 BLAKE2B 966fcbf20522e8bd5fdb349e65551c9d37cffe091800c6c29e3b10d74dfba512e31e43a2841c05e1cb1ab9222f0009d1f301cc6e01ec960d2fcc9b3fe972b8a6 SHA512 0cd27c9c4b2ab8b749ee779b7fcba4a321979602ebabd29c65dfef15f2d7fec3ffd38efeef5868fc0cfc44412b83b5f37acf21586fae3b2ee7cd8879d0ee3dba AUX smbc-1.2.2-size_t.patch 551 BLAKE2B c4cd80f4af3285cdca7e6a5c9812742d6a662856bb986f11d395a5d4a44e3210c1087c976b4e0055768401b99fda6de081c330a1429a901fb4adcd461108934f SHA512 f445ec293a0bda038493faca823266aff96d4e2f41cf8ed5a64beae2b4e1e941ab8de9dab966328f77be9199ba5f8655006d5aabbfcdbd28cb842966f068fbaa +AUX smbc-1.2.2-tinfo.patch 480 BLAKE2B 6b882d6f2b39b7b0876b632382c6ab073918fe3e1d37ec908c8d3d460b3d4ad0fd671a33675bf543ce4304ace59d6b58851ab786bd1bbcca055933f021864557 SHA512 b210ad4e3607429131f5ba6b3fc79ea179cb4c5cc0316ca327f82f59aceac1a0e1157d5376cd374b0142458ee8e821ce33d07ee47e9c7dd8481d9c2e3ed4f70b DIST smbc-1.2.2.tgz 977908 BLAKE2B 481bf7e16b8f6d89abd62e619a13a8692ce1f3ed169a1b3c35864a2a66f2cf10753d7d4151f95acc3428ad628b5888a12f452836297d18f9c8b3ce1d17550010 SHA512 4625ba6bb6b3ffe818826d4af4da0fcb2e516e1ed62ee15ace4cf04d5176d238c5107d349f595809048bafc38d571448e1f1f170ed061dfc8f698836b52e2b84 -EBUILD smbc-1.2.2-r3.ebuild 811 BLAKE2B 58380c2cfe43601fbf9f0a318d93bc9ea93a17175fc75e49bd8ef49d9dae47b1a9286d1f6ac18bc7c3eff09158216c4f4df127447542a57311c865916a7f8fdc SHA512 6cafd0ab443524469b05c1f567bb9a77e56534506fc13eef9b0ba243984602494eb150e3c6c964a2376404b7b1149a27784be7aec138506f34fb84da68667c60 +EBUILD smbc-1.2.2-r3.ebuild 1043 BLAKE2B 0fe6c802d84c1be2838c0236351798e00673708ada52959e9dd14993798fbf55b6e25479df1410c4b82d3da91f347a255270d401b8c056d5dbc9c8730c484630 SHA512 8ae11fcb1315f5c610168634238a46aa70e5dee632ca7aa8eb1a5cdb275f2a787f540c0b80fb399fea3d9ad87bb5e33bca5666e606327780852809462ab9a3fb MISC metadata.xml 652 BLAKE2B c14dc29057d46d671853ac571c5b8eee0da08ecdf049302147b92e12482d530ba5956a2e3d66a39ce46576942552f1acf570b4ff879564d9e0748c893e81707c SHA512 60f80fba5a3f5b3b6c0d2f89f0beebbb66054e8f51930f62391f359960c30317b1d4fb46b022dfae5ef8ca8e9a3ce735b279104dd7b607d2881f2851e30999f7 diff --git a/net-misc/smbc/files/smbc-1.2.2-multiple-definitions-gcc10.patch b/net-misc/smbc/files/smbc-1.2.2-multiple-definitions-gcc10.patch new file mode 100644 index 000000000000..37dcedc4cc1c --- /dev/null +++ b/net-misc/smbc/files/smbc-1.2.2-multiple-definitions-gcc10.patch @@ -0,0 +1,46 @@ +--- smbc-1.2.2.orig/src/static_str.c ++++ smbc-1.2.2/src/static_str.c +@@ -21,6 +21,32 @@ + #include "static_str.h" + #include "fnet.h" + ++char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11, ++ ++ *Rm18, *Rm19, ++ *Rm20, *Rm21, *Rm22, *Rm23, *Rm24, *Rm25, *Rm26, *Rm27, *Rm28, *Rm29, ++ *Rm30, *Rm31, *Rm32, *Rm33, *Rm34, *Rm35, *Rm36, *Rm37, *Rm38, *Rm39, ++ *Rm40, *Rm41, *Rm42, *Rm43, *Rm44, *Rm45, *Rm46, *Rm48, *Rm49, ++ *Rm50, *Rm51, *Rm52, *Rm53, *Rm54, *Rm55, *Rm58, *Rm59, ++ *Rm60, *Rm61, *Rm62, *Rm63, *Rm64, *Rm65, *Rm67, *Rm68, *Rm69, ++ *Rm70, *Rm71, *Rm72, *Rm73, *Rm74, *Rm75, *Rm76, *Rm77, *Rm78, *Rm79, ++ *Rm80, *Rm81, *Rm82, *Rm83, *Rm84, *Rm85, *Rm86, *Rm87, *Rm88, ++ *Rm90, *Rm91, *Rm92, *Rm93, *Rm94, *Rm95, *Rm96, *Rm97, *Rm98, *Rm99, ++ *Rm100, *Rm101, *Rm102, *Rm103, *Rm104, *Rm105, *Rm106, *Rm107, *Rm108, ++ *Rm111, *Rm113, *Rm114, *Rm115, *Rm116, *Rm117, *Rm118, *Rm119, ++ *Rm121, *Rm123, *Rm124, *Rm125, *Rm129, ++ *Rm131, *Rm133, *Rm134, *Rm135, *Rm136, *Rm137, *Rm138, *Rm139, ++ *Rm140, *Rm141, *Rm142, *Rm143, *Rm144, *Rm145, *Rm146, *Rm147, *Rm148, *Rm149, ++ *Rm150, *Rm151, *Rm152, *Rm153, *Rm154, *Rm156, *Rm157, *Rm158, *Rm159, ++ *Rm160, *Rm162, *Rm163, *Rm168, *Rm169, ++ *Rm170, *Rm171, *Rm172, *Rm173, *Rm175, *Rm176, *Rm177, *Rm178, *Rm179, ++ *Rm180, *Rm181, *Rm182, ++ ++ *Rm231, *Rm232, *Rm233, *Rm234, *Rm235, *Rm236, *Rm237, *Rm238, *Rm239, ++ *Rm240, *Rm241, *Rm242, *Rm243, *Rm244, *Rm245, ++ ++ *Rm300, *Rm301, *Rm302, *Rm303, *Rm304, *Rm305, *Rm306, *Rm307; ++ + void + RinitStrings() + { +--- smbc-1.2.2.orig/src/static_str.h ++++ smbc-1.2.2/src/static_str.h +@@ -9,7 +9,7 @@ + */ + // ------------------------------------------------------------------- + +-char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11, ++extern char *Rm1, *Rm2, *Rm3, *Rm4, *Rm5, *Rm6, *Rm7, *Rm8, *Rm9, *Rm10, *Rm11, + + *Rm18, *Rm19, + *Rm20, *Rm21, *Rm22, *Rm23, *Rm24, *Rm25, *Rm26, *Rm27, *Rm28, *Rm29, diff --git a/net-misc/smbc/files/smbc-1.2.2-samba4-includes.patch b/net-misc/smbc/files/smbc-1.2.2-samba4-includes.patch new file mode 100644 index 000000000000..3238fc035e4b --- /dev/null +++ b/net-misc/smbc/files/smbc-1.2.2-samba4-includes.patch @@ -0,0 +1,99 @@ +--- smbc-1.2.2.orig/src/bookmarks.c ++++ smbc-1.2.2/src/bookmarks.c +@@ -23,7 +23,7 @@ + #endif /* not HAVE_STRING_H */ + + #include +-#include ++#include + #include + #include + #include "dulist.h" +--- smbc-1.2.2.orig/src/dulist.c ++++ smbc-1.2.2/src/dulist.c +@@ -22,7 +22,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include "fnet.h" +--- smbc-1.2.2.orig/src/find-index-manage.c ++++ smbc-1.2.2/src/find-index-manage.c +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include "find-index-manage.h" +--- smbc-1.2.2.orig/src/fnet.c ++++ smbc-1.2.2/src/fnet.c +@@ -20,7 +20,7 @@ + #endif /* HAVE_STRINGS_H */ + #endif /* not HAVE_STRING_H */ + +-#include ++#include + #include + #include + #include +--- smbc-1.2.2.orig/src/smb-pack.c ++++ smbc-1.2.2/src/smb-pack.c +@@ -21,7 +21,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include "smb-pack.h" +--- smbc-1.2.2.orig/src/smb-pack.h ++++ smbc-1.2.2/src/smb-pack.h +@@ -18,7 +18,7 @@ + #endif /* HAVE_STRINGS_H */ + #endif /* not HAVE_STRING_H */ + +-#include ++#include + + #define RstrCmp(src, dst) (!strcmp(src, dst)) + +--- smbc-1.2.2.orig/src/smbc.c ++++ smbc-1.2.2/src/smbc.c +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- smbc-1.2.2.orig/src/ttlist.c ++++ smbc-1.2.2/src/ttlist.c +@@ -20,7 +20,7 @@ + #endif /* HAVE_STRINGS_H */ + #endif /* not HAVE_STRING_H */ + +-#include ++#include + #include + #include + #include +--- smbc-1.2.2.orig/src/winpopup.c ++++ smbc-1.2.2/src/winpopup.c +@@ -11,7 +11,7 @@ + + #include + #include +-#include ++#include + #include + #include "winpopup.h" + #include "debug.h" diff --git a/net-misc/smbc/files/smbc-1.2.2-tinfo.patch b/net-misc/smbc/files/smbc-1.2.2-tinfo.patch new file mode 100644 index 000000000000..8c35c4b0b0d0 --- /dev/null +++ b/net-misc/smbc/files/smbc-1.2.2-tinfo.patch @@ -0,0 +1,18 @@ +diff -ur a/configure.in b/configure.in +--- a/configure.in 2022-07-28 13:24:38.673242313 -0500 ++++ b/configure.in 2022-07-28 13:27:43.726466613 -0500 +@@ -94,11 +94,9 @@ + [AC_CHECK_LIB(popt, main)] + ) + +-AC_CHECK_LIB(ncurses, +- main, +- [], +- [AC_CHECK_LIB(ncurses, main)] +- ) ++PKG_CHECK_MODULES([NCURSES], [ncurses], [ ++ LIBS="$NCURSES_LIBS $LIBS" ++], [:]) + + AC_CHECK_LIB(smbclient, + main, diff --git a/net-misc/smbc/smbc-1.2.2-r3.ebuild b/net-misc/smbc/smbc-1.2.2-r3.ebuild index 87ebd6eea0a6..434ea97b5718 100644 --- a/net-misc/smbc/smbc-1.2.2-r3.ebuild +++ b/net-misc/smbc/smbc-1.2.2-r3.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools @@ -11,20 +11,28 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~ppc ~x86" +KEYWORDS="~amd64 ~ppc ~x86" IUSE="nls debug" +BDEPEND="virtual/pkgconfig" DEPEND="dev-libs/popt net-fs/samba sys-libs/ncurses nls? ( sys-devel/gettext )" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}"/${P}-cflags.patch + "${FILESDIR}"/${P}-size_t.patch + "${FILESDIR}"/${P}-samba4-includes.patch + "${FILESDIR}"/${P}-multiple-definitions-gcc10.patch + "${FILESDIR}"/${P}-tinfo.patch +) + src_prepare() { default mv configure.{in,ac} || die - eapply "${FILESDIR}"/${P}-cflags.patch - eapply "${FILESDIR}"/${P}-size_t.patch + # for some reason some build 32bit x86 objects are bundled + rm src/*.o eautoreconf } -- cgit v1.2.3