From 086e7e613ea6526c5cd2922555748e7f9d3a3f6b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 20 Aug 2013 04:03:31 -0300 Subject: your-privacy: fix some things on install file and PKGBUILD --- nonprism/your-privacy/PKGBUILD | 3 ++- nonprism/your-privacy/your-privacy.install | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'nonprism') diff --git a/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD index c5bfbe5d7..3dbc1c733 100644 --- a/nonprism/your-privacy/PKGBUILD +++ b/nonprism/your-privacy/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Parabola Project -pkgname=your-coherence +pkgname=your-privacy pkgver=$(LC_ALL=C date -u +%Y%m%d) pkgrel=1 pkgdesc="This package will remove support for unsafe/dangerous for privacy protocols/services." @@ -7,6 +7,7 @@ arch=('any') url="https://parabolagnulinux.org" license=('GPL3') install=${pkgname}.install +replaces=your-coherence source=(${pkgname}-blacklist-${pkgver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/${pkgname}-blacklist.txt) package() { diff --git a/nonprism/your-privacy/your-privacy.install b/nonprism/your-privacy/your-privacy.install index d5ece49d4..965fdbf43 100644 --- a/nonprism/your-privacy/your-privacy.install +++ b/nonprism/your-privacy/your-privacy.install @@ -14,11 +14,11 @@ pre_install() { Have in mind that, if you want to retain certain packages that support unsafe/dangerous for privacy protocols/services installed on your system, - you'll have to remove your-coherence :) + you'll have to remove your-privacy :) - Please report any issue to the Coherence Team on the usual channels: + Please report any issue to the Nonprism Team on the usual channels: * https://labs.parabola.nu - * irc://freenode.net/#your-coherence + * irc://freenode.net/#nonprism * mailto:dev@lists.parabolagnulinux.org EOM } -- cgit v1.2.3-54-g00ecf From 97161d7676a9268aa73ee18c51fb3d45afad19db Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 20 Aug 2013 04:41:59 -0300 Subject: kdepim-runtime-nonprism: fix package name and features --- nonprism/kdepim-runtime-nonprism/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nonprism') diff --git a/nonprism/kdepim-runtime-nonprism/PKGBUILD b/nonprism/kdepim-runtime-nonprism/PKGBUILD index 8bc3de90e..38a0a1edc 100644 --- a/nonprism/kdepim-runtime-nonprism/PKGBUILD +++ b/nonprism/kdepim-runtime-nonprism/PKGBUILD @@ -4,19 +4,19 @@ # Maintainer (Parabola): André Silva _pkgname=kdepim-runtime -pkgname=kdepim-runtime-coherence +pkgname=kdepim-runtime-nonprism pkgver=4.11.0 pkgrel=1 pkgdesc='Extends the functionality of kdepim, without libkgapi support' arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kdepim-runtime' license=('GPL' 'LGPL' 'FDL') -depends=('kdebase-runtime' 'libkolab' 'libkfbapi') +depends=('kdebase-runtime' 'libkolab') makedepends=('cmake' 'automoc4' 'boost') install="${_pkgname}.install" -replaces=$_pkgname -conflicts=$_pkgname -provides=$_pkgname=$pkgver +replaces=('kdepim-runtime' 'kdepim-runtime-coherence') +conflicts=kdepim-runtime +provides=kdepim-runtime=$pkgver source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz") sha1sums=('ec2a45baf0c2c2ccea633b599a453db52b38dc75') -- cgit v1.2.3-54-g00ecf From f47d70789def071ce501505d51c90099121aef9c Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 20 Aug 2013 04:42:28 -0300 Subject: kdenetwork-kopete-libre-nonprism: add new package to nonprism repo --- nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD | 71 +++++++++++++ .../kdenetwork-kopete.install | 12 +++ .../kdenetwork.install | 11 +++ .../kdenetwork-kopete-libre-nonprism/libotr3.patch | 71 +++++++++++++ .../libre-nonprism.patch | 110 +++++++++++++++++++++ .../mediastreamer29.patch | 22 +++++ 6 files changed, 297 insertions(+) create mode 100644 nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD create mode 100644 nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install create mode 100644 nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install create mode 100644 nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch create mode 100644 nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch create mode 100644 nonprism/kdenetwork-kopete-libre-nonprism/mediastreamer29.patch (limited to 'nonprism') diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD new file mode 100644 index 000000000..d41efa232 --- /dev/null +++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD @@ -0,0 +1,71 @@ +# $Id: PKGBUILD 192541 2013-08-13 18:47:05Z andrea $ +# Maintainer: Andrea Scarpino +# Maintainer (Parabola): André Silva + +_pkgname=kdenetwork-kopete +pkgname=kdenetwork-kopete-libre-nonprism +pkgver=4.11.0 +pkgrel=1 +pkgdesc='Instant Messenger, without skype and unsafe/dangerous protocols support' +url='http://kde.org/applications/internet/kopete/' +arch=('i686' 'x86_64' 'mips64el') +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdenetwork') +depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr3' 'libmsn' 'libidn' + 'qimageblitz' 'libgadu' 'mediastreamer' 'jsoncpp') +makedepends=('cmake' 'automoc4' 'boost') +install=${_pkgname}.install +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz" + 'libotr3.patch' + 'mediastreamer29.patch' + 'libre-nonprism.patch') +sha1sums=('a67716f14a07cdbacf3df40983db17f594eb768b' + '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384' + '317683a5c2acd0a0058c5ab42f6006e9db511ef3' + '3c46e5c80ef0cd3f6fe9fb6d5cb8c252c6792208') + +prepare() { + cd kopete-${pkgver} + patch -p2 -i "${srcdir}"/libotr3.patch + patch -p1 -i "${srcdir}"/mediastreamer29.patch + # Based on http://bzr.trisquel.info/package-helpers/trunk/annotate/head%3A/helpers/natty/make-kdenetwork, revision 34. + sed -i 's/Skype protocol" ON/Skype protocol" OFF/g' protocols/CMakeLists.txt + rm -rf protocols/skype + # remove unsafe/dangerous services + sed -i 's/Oscar (ICQ and AIM) protocol" ON/Oscar (ICQ and AIM) protocol" OFF/g' protocols/CMakeLists.txt + rm -rf protocols/oscar + sed -i 's/Yahoo protocol" ON/Yahoo protocol" OFF/g' protocols/CMakeLists.txt + rm -rf protocols/yahoo + sed -i 's/QQ protocol" ON/QQ protocol" OFF/g' protocols/CMakeLists.txt + rm -rf protocols/qq + sed -i 's/Novell GroupWise Messenger protocol" ON/Novell GroupWise Messenger protocol" OFF/g' protocols/CMakeLists.txt + rm -rf protocols/groupwise + sed -i 's/Gadu-Gadu protocol" ON/Gadu-Gadu protocol" OFF/g' protocols/CMakeLists.txt + rm -rf protocols/gadu + sed -i 's/Google Talk support" ON/Google Talk support" OFF/g' protocols/CMakeLists.txt + sed -i 's/Window Live Messenger support" ON/Window Live Messenger support" OFF/g' protocols/CMakeLists.txt + rm -rf protocols/wlm + sed -i 's/Windows Live Messenger voice clip support" ON/Windows Live Messenger voice clip support" OFF/g' protocols/CMakeLists.txt + sed -i 's/meanwhile protocol" ON/meanwhile protocol" OFF/g' protocols/CMakeLists.txt + rm -rf protocols/meanwhile + patch -p1 -i "${srcdir}"/libre-nonprism.patch +} + +build() { + mkdir build + cd build + cmake ../kopete-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DKDE4_BUILD_TESTS=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON + make +} + +package() { + cd build + make DESTDIR=$pkgdir install +} diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install new file mode 100644 index 000000000..5495fb1b5 --- /dev/null +++ b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork-kopete.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/nonprism/kdenetwork-kopete-libre-nonprism/kdenetwork.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch new file mode 100644 index 000000000..1e96c98d6 --- /dev/null +++ b/nonprism/kdenetwork-kopete-libre-nonprism/libotr3.patch @@ -0,0 +1,71 @@ +diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake +--- a/kopete/cmake/modules/FindLibOTR.cmake 2012-08-12 18:08:59.000000000 -0600 ++++ b/kopete/cmake/modules/FindLibOTR.cmake 2012-11-09 12:14:24.251450904 -0700 +@@ -13,13 +13,13 @@ + SET(LIBOTR_FIND_QUIETLY TRUE) + ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY) + +-FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h) ++FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h) + +-FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr) ++FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3) + +-# Determine version information from libotr/version.h ++# Determine version information from libotr3/version.h + IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY ) +- EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output) ++ EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output) + STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}") + STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}") + # Check if version is at least 3.2.0 +diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h +--- a/kopete/plugins/otr/authenticationwizard.h 2012-08-12 18:09:00.000000000 -0600 ++++ b/kopete/plugins/otr/authenticationwizard.h 2012-11-09 12:15:11.181265336 -0700 +@@ -26,7 +26,7 @@ + */ + + extern "C"{ +-#include "libotr/proto.h" ++#include "libotr3/proto.h" + } + + #include "kopetechatsession.h" +diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h +--- a/kopete/plugins/otr/otrlchatinterface.h 2012-08-12 18:09:00.000000000 -0600 ++++ b/kopete/plugins/otr/otrlchatinterface.h 2012-11-09 12:16:10.141032744 -0700 +@@ -36,10 +36,10 @@ + #include "authenticationwizard.h" + + extern "C" { +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + } + + +diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h +--- a/kopete/plugins/otr/otrlconfinterface.h 2012-08-12 18:09:00.000000000 -0600 ++++ b/kopete/plugins/otr/otrlconfinterface.h 2012-11-09 12:15:56.961084991 -0700 +@@ -32,11 +32,11 @@ + #include + + extern "C" { +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + } + + class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch new file mode 100644 index 000000000..b6915cbb5 --- /dev/null +++ b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch @@ -0,0 +1,110 @@ +diff --git a/doc/index.docbook b/doc/index.docbook +index 1576dc9..daf7170 100644 +--- a/doc/index.docbook ++++ b/doc/index.docbook +@@ -20,7 +20,6 @@ + + + +- + ]> +