commit kvpnc for openSUSE:Factory
Hello community, here is the log from the commit of package kvpnc for openSUSE:Factory checked in at 2016-06-19 12:52:56 Comparing /work/SRC/openSUSE:Factory/kvpnc (Old) and /work/SRC/openSUSE:Factory/.kvpnc.new (New) Package is "kvpnc" Changes: --- /work/SRC/openSUSE:Factory/kvpnc/kvpnc.changes 2016-03-17 16:47:30.0 +0100 +++ /work/SRC/openSUSE:Factory/.kvpnc.new/kvpnc.changes 2016-06-19 12:52:58.0 +0200 @@ -1,0 +2,7 @@ +Fri Jun 17 12:04:25 UTC 2016 - tittiatc...@gmail.com + +- Cherry pick important commits from upstream (also fixes GCC6 build) + * upstream-fixes.patch + * kvpnc-gcc6.patch (boo#985190) + +--- New: kvpnc-gcc6.patch upstream-fixes.patch Other differences: -- ++ kvpnc.spec ++ --- /var/tmp/diff_new_pack.0piMJk/_old 2016-06-19 12:52:59.0 +0200 +++ /var/tmp/diff_new_pack.0piMJk/_new 2016-06-19 12:52:59.0 +0200 @@ -26,6 +26,8 @@ Source0:http://download.gna.org/kvpnc/%{name}-%{version}-kde4.tar.bz2 Source1:http://download.gna.org/kvpnc/%{name}-0.9.6-kde4-locale.tar.bz2 Patch0: kvpnc-gcc47.patch +Patch1: upstream-fixes.patch +Patch2: kvpnc-gcc6.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # only needed to patch broken images in the upstream tarball BuildRequires: ImageMagick @@ -49,6 +51,8 @@ %prep %setup -q -n %{name}-%{version}-kde4 -a1 %patch0 -p1 +%patch1 -p0 +%patch2 -p1 echo "find_package(Msgfmt REQUIRED)" >> CMakeLists.txt echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt echo "add_subdirectory( po )" >> CMakeLists.txt ++ kvpnc-gcc6.patch ++ diff -urNB new/src/utils.cpp new1/src/utils.cpp --- new/src/utils.cpp 2016-06-17 14:36:23.534039790 +0200 +++ new1/src/utils.cpp 2016-06-17 14:43:20.292353264 +0200 @@ -914,7 +914,7 @@ NameAndPidOfProgramListenProcess->start(proc, args); if (!NameAndPidOfProgramListenProcess->waitForStarted()) { kError() << "netstat fails!" << endl; -return false; +return ""; } else { NameAndPidOfProgramListenProcess->waitForFinished(); @@ -946,7 +946,7 @@ GetEmailAddressOfCertProcess->start(proc, args); if (!GetEmailAddressOfCertProcess->waitForStarted()) { kError() << "GetEmailAddressOfCertProcess" << endl; -return false; +return ""; } else { GetEmailAddressOfCertProcess->waitForFinished(); disconnect(GetEmailAddressOfCertProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(readOutGetEmailAddressOfCert())); ++ upstream-fixes.patch ++ --- loginfo 2005-10-08 14:26:34.0 +0200 +++ loginfo 2016-06-17 14:31:39.532482472 +0200 @@ -1 +0,0 @@ -ALL /usr/bin/perl /home/crissi/ciabot_cvs_1.12.pl %p %{s} %n $USER project from_email dest_email ignore_regexp --- src/CMakeLists.txt 2010-05-19 10:47:21.0 +0200 +++ src/CMakeLists.txt 2016-06-17 14:31:39.532482472 +0200 @@ -180,7 +180,8 @@ target_link_libraries(kvpnc_bin ${KDE4_KFILE_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KIO_LIBS} ${QT_QTXML_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBS} ${LIBGCRYPT_LIBRARIES} ${KDE4_KPTY_LIBS}) -install(FILES kvpnc.notifyrc ping_check.sh DESTINATION ${DATA_INSTALL_DIR}/kvpnc) +install(FILES kvpnc.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kvpnc) +install(PROGRAMS ping_check.sh DESTINATION ${DATA_INSTALL_DIR}/kvpnc) install(TARGETS kvpnc_bin ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES kvpncui.rc DESTINATION ${DATA_INSTALL_DIR}/kvpnc) install(FILES kvpnc.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) --- src/kvpncconfig.cpp 2010-03-08 11:26:33.0 +0100 +++ src/kvpncconfig.cpp 2016-06-17 14:31:42.208497071 +0200 @@ -4295,7 +4295,7 @@ appPointer->processEvents(); if (useKwallet && KWallet::Wallet::isEnabled()) -configgroup.deleteEntry("First use of Kwallet", false); +configgroup.deleteEntry("First use of Kwallet"); /* = user data = */ --- src/utils.cpp 2010-02-28 12:22:35.0 +0100 +++ src/utils.cpp 2016-06-17 14:36:23.534039790 +0200 @@ -1146,27 +1146,6 @@ return needsPassphrase; } -QString Utils::getHostname() -{ -Hostname = "linux.local"; - -GetHostnameProcess = new QProcess(this); -QString proc = "hostname"; -QStringList args; -connect(GetHostnameProcess, SIGNAL(readyReadStandardOutput()), this, SLOT(readStdOutGetHostname())); -connect(GetHostnameProcess, SIGNAL(readyReadStandardError()), this, SLOT(readStdErrGetHostname())); -GetHostnameProcess->setEnvironment(*env); -GetHostnameProcess->start(proc, args); -if (!GetHostnameProcess->waitForStarted()) { -kError() << "Unable to start
commit kvpnc for openSUSE:Factory
Hello community, here is the log from the commit of package kvpnc for openSUSE:Factory checked in at 2016-03-17 16:33:57 Comparing /work/SRC/openSUSE:Factory/kvpnc (Old) and /work/SRC/openSUSE:Factory/.kvpnc.new (New) Package is "kvpnc" Changes: --- /work/SRC/openSUSE:Factory/kvpnc/kvpnc.changes 2013-04-22 14:07:48.0 +0200 +++ /work/SRC/openSUSE:Factory/.kvpnc.new/kvpnc.changes 2016-03-17 16:47:30.0 +0100 @@ -1,0 +2,5 @@ +Tue Mar 8 21:07:10 UTC 2016 - bwiedem...@suse.com + +- Strip png timestamps to fix build-compare + +--- Other differences: -- ++ kvpnc.spec ++ --- /var/tmp/diff_new_pack.6rsmRz/_old 2016-03-17 16:47:31.0 +0100 +++ /var/tmp/diff_new_pack.6rsmRz/_new 2016-03-17 16:47:31.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package kvpnc # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -81,8 +81,8 @@ else nugeom="" fi -[ -n "$nugeom" ] && mogrify -extent "$nugeom" -background transparent -gravity "$grav" "$f" -mogrify -scale "$s"x"$s" -background transparent "$f" +[ -n "$nugeom" ] && mogrify -strip -extent "$nugeom" -background transparent -gravity "$grav" "$f" +mogrify -strip -scale "$s"x"$s" -background transparent "$f" fi done done
commit kvpnc for openSUSE:Factory
Hello community, here is the log from the commit of package kvpnc for openSUSE:Factory checked in at 2013-04-22 14:07:46 Comparing /work/SRC/openSUSE:Factory/kvpnc (Old) and /work/SRC/openSUSE:Factory/.kvpnc.new (New) Package is kvpnc, Maintainer is kde-maintain...@suse.de Changes: --- /work/SRC/openSUSE:Factory/kvpnc/kvpnc.changes 2012-03-22 12:34:35.0 +0100 +++ /work/SRC/openSUSE:Factory/.kvpnc.new/kvpnc.changes 2013-04-22 14:07:48.0 +0200 @@ -1,0 +2,5 @@ +Sat Apr 20 14:37:24 UTC 2013 - hrvoje.sen...@gmail.com + +- Remove lo22-action-connecting.png image as it is corrupt + +--- Other differences: -- ++ kvpnc.spec ++ --- /var/tmp/diff_new_pack.NFLYO0/_old 2013-04-22 14:07:50.0 +0200 +++ /var/tmp/diff_new_pack.NFLYO0/_new 2013-04-22 14:07:50.0 +0200 @@ -1,7 +1,7 @@ # # spec file for package kvpnc # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -60,6 +60,8 @@ sed -i s/__DATE__/\$FAKE_BUILDDATE\/ src/main.cpp sed -i s/__DATE__/\$FAKE_BUILDDATE\/ src/kvpncconfig.cpp +# This image looks corrupt? +rm $RPM_BUILD_DIR/%{name}-%{version}-kde4/src/icons/actions/lo22-action-connecting.png # Patch image with wrong dimensions - Fixes rpmlint warning wrong-icon-size for d in src/icons src/icons/actions; do pushd $d -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kvpnc for openSUSE:Factory
Hello community, here is the log from the commit of package kvpnc for openSUSE:Factory checked in at 2012-03-22 12:34:00 Comparing /work/SRC/openSUSE:Factory/kvpnc (Old) and /work/SRC/openSUSE:Factory/.kvpnc.new (New) Package is kvpnc, Maintainer is kde-maintain...@suse.de Changes: --- /work/SRC/openSUSE:Factory/kvpnc/kvpnc.changes 2011-09-23 02:07:31.0 +0200 +++ /work/SRC/openSUSE:Factory/.kvpnc.new/kvpnc.changes 2012-03-22 12:34:35.0 +0100 @@ -1,0 +2,5 @@ +Wed Mar 21 22:06:32 UTC 2012 - dims...@opensuse.org + +- Add kvpnc-gcc47.patch: Fix build with gcc 4.7. + +--- New: kvpnc-gcc47.patch Other differences: -- ++ kvpnc.spec ++ --- /var/tmp/diff_new_pack.nRbaVZ/_old 2012-03-22 12:34:36.0 +0100 +++ /var/tmp/diff_new_pack.nRbaVZ/_new 2012-03-22 12:34:36.0 +0100 @@ -1,7 +1,7 @@ # # spec file for package kvpnc # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,18 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: kvpnc Version:0.9.6a -Release:1 -License:GPL-2.0+ +Release:0 Summary:GUI Front-End for various VPN clients -Url:http://home.gna.org/kvpnc/ +License:GPL-2.0+ Group: Productivity/Networking/System +Url:http://home.gna.org/kvpnc/ Source0:http://download.gna.org/kvpnc/%{name}-%{version}-kde4.tar.bz2 Source1:http://download.gna.org/kvpnc/%{name}-0.9.6-kde4-locale.tar.bz2 +Patch0: kvpnc-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # only needed to patch broken images in the upstream tarball BuildRequires: ImageMagick @@ -49,6 +48,7 @@ %prep %setup -q -n %{name}-%{version}-kde4 -a1 +%patch0 -p1 echo find_package(Msgfmt REQUIRED) CMakeLists.txt echo find_package(Gettext REQUIRED) CMakeLists.txt echo add_subdirectory( po ) CMakeLists.txt ++ kvpnc-gcc47.patch ++ Index: kvpnc-0.9.6a-kde4/src/kvpnc.cpp === --- kvpnc-0.9.6a-kde4.orig/src/kvpnc.cpp +++ kvpnc-0.9.6a-kde4/src/kvpnc.cpp @@ -75,6 +75,7 @@ #include cstdlib #include ctime #include iomanip +#include unistd.h #include ui_mainviewbase4.h #include ciscocertificateenrollment.h -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit kvpnc for openSUSE:Factory
Hello community, here is the log from the commit of package kvpnc for openSUSE:Factory checked in at 2011-12-06 18:22:11 Comparing /work/SRC/openSUSE:Factory/kvpnc (Old) and /work/SRC/openSUSE:Factory/.kvpnc.new (New) Package is kvpnc, Maintainer is kde-maintain...@suse.de Changes: Other differences: -- ++ kvpnc.spec ++ --- /var/tmp/diff_new_pack.XGNgr0/_old 2011-12-06 18:39:22.0 +0100 +++ /var/tmp/diff_new_pack.XGNgr0/_new 2011-12-06 18:39:22.0 +0100 @@ -21,7 +21,7 @@ Name: kvpnc Version:0.9.6a Release:1 -License:GPLv2+ +License:GPL-2.0+ Summary:GUI Front-End for various VPN clients Url:http://home.gna.org/kvpnc/ Group: Productivity/Networking/System -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org