Chakra_Linux/desktop
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/desktop.git synced 2025-02-03 14:27:15 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

corrections for kdeadmin, kdeutils, no system-print-config-common in Chakra

Browse Source
This commit is contained in:
abveritas 2012-06-22 05:50:07 +00:00
parent 84b2971851
commit 0be0a3dde2
3 changed files with 65 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kdeadmin/PKGBUILD
View File

@ -27,7 +27,7 @@ install=kdeadmin.install
options=('docs' '!splithdr' 'splitdbg' 'log') options=('docs' '!splithdr' 'splitdbg' 'log')
makedepends=('pkgconfig' 'cmake' 'automoc4' "kdepimlibs>=${_kdever}" "kde-runtime>=${_kdever}" makedepends=('pkgconfig' 'cmake' 'automoc4' "kdepimlibs>=${_kdever}" "kde-runtime>=${_kdever}"
"kdebindings-pykde4>=${_kdever}" 'system-config-printer-common' "kdepim-runtime>=${_kdever}" "docbook-xsl") "kdebindings-pykde4>=${_kdever}" 'system-config-printer' "kdepim-runtime>=${_kdever}" "docbook-xsl")
source=("$_mirror/${pkgbase}-$_kdever.tar.xz" source=("$_mirror/${pkgbase}-$_kdever.tar.xz"
"syslog-path.patch") "syslog-path.patch")

60
kdenetwork/gcc47.patch Normal file
View File

@ -0,0 +1,60 @@
--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:03:23 1292761
+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:11:00 1292762
@@ -31,6 +31,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
+#include <unistd.h>
#endif
#include <cstring>
--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:03:23 1292761
+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:11:00 1292762
@@ -27,6 +27,12 @@
#include "talk/base/ssladapter.h"
+#ifdef POSIX
+extern "C" {
+#include <unistd.h>
+}
+#endif
+
#if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL)
#ifdef WIN32
#define SSL_USE_SCHANNEL 1
--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:03:23 1292761
+++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:11:00 1292762
@@ -198,15 +198,6 @@
}
template<class CTYPE>
-size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
- va_list args;
- va_start(args, format);
- size_t len = vsprintfn(buffer, buflen, format, args);
- va_end(args);
- return len;
-}
-
-template<class CTYPE>
size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format,
va_list args) {
int len = vsnprintf(buffer, buflen, format, args);
@@ -217,6 +208,15 @@
return len;
}
+template<class CTYPE>
+size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) {
+ va_list args;
+ va_start(args, format);
+ size_t len = vsprintfn(buffer, buflen, format, args);
+ va_end(args);
+ return len;
+}
+
///////////////////////////////////////////////////////////////////////////////
// Allow safe comparing and copying ascii (not UTF-8) with both wide and
// non-wide character strings.

9
kdeutils-printer-applet/PKGBUILD
View File

@ -1,8 +1,8 @@
# #
# KDE SC Packages for Chakra, part of chakra-project.org # KDE SC Packages for Chakra, part of chakra-project.org
# #
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org> # maintainer: abveritas[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer: Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config # include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
@ -19,15 +19,14 @@ pkgdesc="A system tray utility that shows current print jobs, printer warnings a
url="http://www.kde.org" url="http://www.kde.org"
license=('GPL' 'LGPL' 'FDL') license=('GPL' 'LGPL' 'FDL')
options=('docs' '!splithdr' 'splitdbg' 'log') options=('docs' '!splithdr' 'splitdbg' 'log')
depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}" "kdebindings-pykde4>=${_kdever}" 'system-config-printer-common') depends=("kde-runtime>=${_kdever}" "kde-baseapps>=${_kdever}" "kdebindings-pykde4>=${_kdever}" 'system-config-printer')
conflicts=("kdeutils-common") conflicts=("kdeutils-common")
groups=("kde" "kdeutils" "kde-uninstall") groups=("kde" "kdeutils" "kde-uninstall")
categories=('utils') categories=('utils')
install=kdeutils.install install=kdeutils.install
makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}" makedepends=('pkgconfig' 'cmake' 'automoc4' "kdelibs>=${_kdever}"
"kdepimlibs>=${_kdever}" "kde-baseapps>=${_kdever}" "kdepimlibs>=${_kdever}" "kde-baseapps>=${_kdever}"
"kde-workspace>=${_kdever}" "kdebindings-pykde4>=${_kdever}" "kde-workspace>=${_kdever}" "kdebindings-pykde4>=${_kdever}")
'system-config-printer-common')
source=($_mirror/${_pkgname}-$_kdever.tar.xz) source=($_mirror/${_pkgname}-$_kdever.tar.xz)
md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`) md5sums=(`grep ${_pkgname}-$_kdever.tar.xz ../kde-sc.md5 | cut -d" " -f1`)