diff options
Diffstat (limited to 'net-im/vacuum')
| -rw-r--r-- | net-im/vacuum/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/vacuum/Manifest | 20 | ||||
| -rw-r--r-- | net-im/vacuum/files/vacuum-1.1.1-minizip.patch | 38 | ||||
| -rw-r--r-- | net-im/vacuum/files/vacuum-1.1.1-zlib.patch | 49 |
4 files changed, 14 insertions, 99 deletions
diff --git a/net-im/vacuum/ChangeLog b/net-im/vacuum/ChangeLog index c71d304b23c3..6ff557f24ffd 100644 --- a/net-im/vacuum/ChangeLog +++ b/net-im/vacuum/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/vacuum # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/ChangeLog,v 1.15 2013/09/21 12:55:34 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/vacuum/ChangeLog,v 1.16 2013/10/07 10:59:18 pinkbyte Exp $ + + 07 Oct 2013; Sergey Popov <pinkbyte@gentoo.org> + -files/vacuum-1.1.1-minizip.patch, -files/vacuum-1.1.1-zlib.patch: + Drop old and unused patches 21 Sep 2013; Tom Wijsman <TomWij@gentoo.org> vacuum-9999.ebuild: Update SLOT and add a qtsql dependency for 9999 ebuild, proxied commit for diff --git a/net-im/vacuum/Manifest b/net-im/vacuum/Manifest index 17e468312c96..7defc97d0e5f 100644 --- a/net-im/vacuum/Manifest +++ b/net-im/vacuum/Manifest @@ -1,21 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX vacuum-1.1.1-minizip.patch 1723 SHA256 b93dd50385a9b0739253a84b0e17d0686b4807e574a7065a8c95d690ae1ce596 SHA512 2da6420c3790a3bf39e2c500c911a66758c0941b7c3ca58653f62d79b84541dadb9b0aa15c26695380150dd357bdfebecf39ec53b22aca1bceca465b47e6611f WHIRLPOOL 55b0ed1d570962cdddaf1323e83df0ec7070c811da7b1246094ea6d791e92fe547cab71629bcf12394c6593608f4134009ab76cd776702fe2d0b7f16d18191e4 -AUX vacuum-1.1.1-zlib.patch 1506 SHA256 9f74f3f54ec82715b919ce6ade4c8f121c1d80238847484653d19ac766d2126e SHA512 67c6ae391ab6778ca5ddac5074f9e3cc98530b3934d8a0cb11fb5ccbe138ae66ef4408e41aae5e3d01afab08e76d8dd37300dfd83137ec6f753ad9163e98330b WHIRLPOOL fdaf76378520e5a211a344d92e799dd48a9a1488e054ea785b468c812b6e31ac3ec0babab80cf3ec5029a1fe8182738e6c12d2e24aaf353f7d08860bf677e266 DIST vacuum-1.2.2.tar.xz 1612692 SHA256 1d0faa83c5610a2f525494c15d233c09bc89b7b9f079a20aac07ce497adef3da SHA512 ebaf6bbf058ed7496f3f2f27a60c8421f6cc0593aa5f96ca8de47ca79e7e56b7df74ef2f5d5ddcdd29543dfb6631b660825c4dc870291071d9a1f20e3dcb6db6 WHIRLPOOL d6aa94d7be8d678c346c563d4b622b938101414333fce743e06dbcf47d6bd4a58e471eaee55c7638250fa72f45fea8a8004333e8a971e7265f9915ad86fe35fb EBUILD vacuum-1.2.2.ebuild 2403 SHA256 e7485a0d62f5159147bd4e6d5a60cb20799408b51da7cfb884d9b3871cc81200 SHA512 9f9a38f88615ecf662b680279b319973cc0fcf5497e2df73017b382b770571a957a8dfc1c4be017ad4184ed2e12a7a3702362436fa7865009f0d79073107f039 WHIRLPOOL 3db2ddd6d855e8de849b4376194555f9a5b321f6a37c02d5472c9e71468d6ecc81b982b6999e223abe492731a3c98e3a81f20e965708f753758b96ba299e4851 EBUILD vacuum-9999.ebuild 3246 SHA256 e8c52a1874135c9cc691842a2586a110ff95e6265fde584ce94ca7e71697cbf4 SHA512 eb2e7eedb114b103dce5d28cf59f97ae3fa9b582c396d6c9122c9b7bb3715ed89bd2094a453ffbe45bf06245262854f9d1b1d19d5edd6eb8158c66460d41cda2 WHIRLPOOL ede684aed6d7720827032775e2d161a6f2543b036454e6f8b3327d86934239fdba74ee95c16cacf88290b80a61d6dc74673b15661ac45f9b5cbbc30e776a3170 -MISC ChangeLog 2943 SHA256 4a51aa9a39705c486a25c9a3e442d16bb1bc97f68da9eff723ad294a7f76ddff SHA512 b5c09576ddf6611c43ba13230f7454a7c284976effdc0d0b6276b2f400cb39acd02c8a9163ecd0186d65e224944beb4e2710156820098e014c7fa13c17ed285d WHIRLPOOL 6ad341a61f938ee33ea23ab9beb970aeff8ca45ad9f1d05a4e4aa61f1bdbeff591197c338f420b739743a2010b7bdc87298dd66ba454008d064bf8bdf723a7f3 +MISC ChangeLog 3095 SHA256 1ce2ce724458d2df7ca3f21efa510978facb9f541ef5e29565a44208a0bf60c9 SHA512 f93e17c76e9920e108416d9a141a9edbadc9aa7cedd7ac3bdf82b9decd24511589440ad9d5ec423154c1a0e7b671891250b7c46ab2785cc0fd88b70e7dccb5be WHIRLPOOL aa425e338a0c5a84eac93def2c1e54454a9e0b90fd1b7dcd1ddd4a3b9753a4359237c8c6f9f812f0a6a76279e5b7bebb9c291c3f263e8b90839b658cc720b0c5 MISC metadata.xml 4510 SHA256 5e72505bfad6dc1162a8fb3346a5c321509d5657f5074bbe573af6e982343041 SHA512 7c9647c95733d3a6eac1ae9e9edb0d31567b86e97ddc32f2fd38afbbb7166d0c6e649810d5c61b36581b58fb11303686b88a11a44001f03f60bfd5d1864d0caf WHIRLPOOL 0b9651290d35f8612c815eee820b6e66a94814b68bfe1d34f508c2cd86b8d9ddfb7dc744524bf2227d00a4fabd3aa1671f45a431de100e223ac9fdc07e613cc0 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.21 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJSPZYZAAoJEJWyH81tNOV90MoH/RctrV7c/b4VDSlgbtHXuu6b -DK66gqf9YbdGv9rcqcGdAZNX9B6WKBN4zGh6KNmO/vh/pet1zIE2A5CWcq7juUt9 -f2HGnPs+mM8p77maPx604yUsOwTFpUXMmdTkkYoH4bWJrWuckqMdga9WqDKMOsGx -lfnTt98gM03zbYZjBnvJH8uxOzUdmk1NUMtfLFEa1HBdo+QlUQYc6VKZZfZKRVck -Vp1fF/zdOBDZUHP4gzLOSAX7f/9CmFdjOgjWyDWhfv6tu8Cm7viqWpwaQD5sxOzz -PSGfYahH3h7cpINQ6No+98J7lEH2IviyJzjcyhRXSY/TPA+i8xiCWfmNR1DIN8w= -=Nwqv +iQEcBAEBCAAGBQJSUpPbAAoJECo/aRed9267Uq8H/iFmwWflUjUNcWifQ2oFwp07 +dQ6mIMVZPqKoh6vzKN5862le8H1kSQ733DloJygiuuSkKjp0E966KfqilNs/JiWo +/9eBRZuZXSiONDMBg8amfEj/tGP4JScg57L5djjwBeIykQ3WX4xd0ITZ5fgGjZO6 +PVGt+sVt31YURRCpK2RITQUcCNeNPUh6KO1Y1DXwNP+lzNWSRAZukke7/KIERIUg +mK4Yas9MipfXwUvl/aYqTfWHuaWYJHhenLlH+scOZCF4NAWdmV58EXJpcsrHOdfo +ymAcz3IuV7Onyh72fzOqoWHTxrjSJzKlv/4TWuHbLLB7C800EKREsUWrImtv6XQ= +=rn1a -----END PGP SIGNATURE----- diff --git a/net-im/vacuum/files/vacuum-1.1.1-minizip.patch b/net-im/vacuum/files/vacuum-1.1.1-minizip.patch deleted file mode 100644 index 9e71038fd3d0..000000000000 --- a/net-im/vacuum/files/vacuum-1.1.1-minizip.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 433b646f92e629fae235f23ebbfbec6ea5ff72a5 Mon Sep 17 00:00:00 2001 -From: Maxim Ignatenko <gelraen.ua@gmail.com> -Date: Sun, 4 Dec 2011 20:00:14 +0000 -Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BE=D0=BF=D1=86=D0=B8=D1=8F=20FORCE=5FBUNDLED=5FMINIZIP=20=D0=B4=D0=BB=D1=8F=20cmake,=20=D0=BF=D0=BE=D0=B7=D0=B2=D0=BE=D0=BB=D1=8F=D1=8E=D1=89=D0=B0=D1=8F=20=D0=B8=D0=B3=D0=BD=D0=BE=D1=80=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D1=82=D1=8C=20=D0=BD=D0=B0=D0=BB=D0=B8=D1=87=D0=B8=D0=B5=20=D0=B2=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=B5=20=D0=B1=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D0=B8=20minizip.?= -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -git-svn-id: http://vacuum-im.googlecode.com/svn/trunk@1670 8ee3b2d0-dc07-11de-995a-ab19b33c1a40 ---- - CMakeLists.txt | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 06da875..bfb33ca 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -20,11 +20,17 @@ set(LANGS "" CACHE STRING "List of languages to build localization for (this var - set(USED_LANGS "" CACHE INTERNAL "List of languages actually used for generating targets") - add_lang_options() - -+set(FORCE_BUNDLED_MINIZIP NO CACHE BOOL "Use bundled minizip even if local system have one") -+ - find_library(SYSTEM_ZLIB_FOUND z) - find_library(SYSTEM_IDN_FOUND idn) - find_library(SYSTEM_MINIZIP_FOUND minizip) - find_library(SYSTEM_QTLOCKEDFILE_FOUND QtSolutions_LockedFile-2.4) - -+if (FORCE_BUNDLED_MINIZIP) -+ set(SYSTEM_MINIZIP_FOUND NO) -+endif (FORCE_BUNDLED_MINIZIP) -+ - if (SYSTEM_ZLIB_FOUND) - add_definitions(-DUSE_SYSTEM_ZLIB) - endif (SYSTEM_ZLIB_FOUND) --- -1.7.3.4 - diff --git a/net-im/vacuum/files/vacuum-1.1.1-zlib.patch b/net-im/vacuum/files/vacuum-1.1.1-zlib.patch deleted file mode 100644 index 46df1062e0e4..000000000000 --- a/net-im/vacuum/files/vacuum-1.1.1-zlib.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 88360d515a06ef08fd3e16f462fe0a869b55ca1d Mon Sep 17 00:00:00 2001 -From: Sergey Potapov <potapov.s.a@gmail.com> -Date: Mon, 17 Oct 2011 11:54:39 +0000 -Subject: Плагин Compress не собирался в Gentoo после обновления системного ZLib. - -git-svn-id: http://vacuum-im.googlecode.com/svn/trunk@1636 8ee3b2d0-dc07-11de-995a-ab19b33c1a40 ---- -diff --git a/src/plugins/compress/compression.cpp b/src/plugins/compress/compression.cpp -index b59b95d..3ca6bd4 100644 ---- a/src/plugins/compress/compression.cpp -+++ b/src/plugins/compress/compression.cpp -@@ -138,30 +138,20 @@ void Compression::stopZlib() -
- void Compression::processData(QByteArray &AData, bool ADataOut)
- {
-- if (AData.size()>0)
-+ if (AData.size() > 0)
- {
-- z_streamp zstream;
-- int (*zfunc) OF((z_streamp strm, int flush));
-- if (ADataOut)
-- {
-- zstream = &FDefStruc;
-- zfunc = deflate;
-- }
-- else
-- {
-- zstream = &FInfStruc;
-- zfunc = inflate;
-- }
--
- int ret;
- int dataPosOut = 0;
-+
-+ z_streamp zstream = ADataOut ? &FDefStruc : &FInfStruc;
- zstream->avail_in = AData.size();
- zstream->next_in = (Bytef *)(AData.constData());
-+
- do
- {
- zstream->avail_out = FOutBuffer.capacity() - dataPosOut;
- zstream->next_out = (Bytef *)(FOutBuffer.data() + dataPosOut);
-- ret = zfunc(zstream,Z_SYNC_FLUSH);
-+ ret = ADataOut ? deflate(zstream,Z_SYNC_FLUSH) : inflate(zstream,Z_SYNC_FLUSH);
- switch (ret)
- {
- case Z_OK:
--- -cgit v0.9.0.2 |