Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=38c919ec0f3a11fbead5d93d6c991f3054041701
commit 38c919ec0f3a11fbead5d93d6c991f3054041701 Author: Miklos Vajna <vmik...@frugalware.org> Date: Sun Nov 27 15:04:11 2011 +0100 nx-3.5.0-1-i686 - version bump diff --git a/source/xapps-extra/nx/FrugalBuild b/source/xapps-extra/nx/FrugalBuild index 110ebdb..799f809 100644 --- a/source/xapps-extra/nx/FrugalBuild +++ b/source/xapps-extra/nx/FrugalBuild @@ -2,8 +2,8 @@ # Maintainer: Miklos Vajna <vmik...@frugalware.org> pkgname=nx -pkgver=3.4.0 -pkgrel=3 +pkgver=3.5.0 +pkgrel=1 pkgdesc="NX provides a proxy system for the X Window System." url="http://www.nomachine.com"; depends=('expat' 'audiofile' 'openssl>=1.0.0' 'libjpeg>=8a' 'libpng>=1.4.1' 'libxt>=1.0.3-3' 'libxp' 'libxdamage>=1.1.1-3' 'libxrandr>=1.3.0' 'libxtst') @@ -12,26 +12,28 @@ groups=('xapps-extra') replaces=('nx-x11' 'nxproxy') archs=('i686' 'ppc' 'x86_64') up2date="lynx -dump $url/sources.php |grep nx-X11|sed 's/.*nx-X11-\(.*\)-.*/\1/;q'" -source=(http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-2.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-1.tar.gz +source=(http://64.34.161.181/download/$pkgver/sources/nxproxy-$pkgver-1.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxcomp-$pkgver-2.tar.gz http://64.34.161.181/download/$pkgver/sources/nxcompext-$pkgver-1.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-1.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-1.tar.gz - http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-1.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxssh-$pkgver-2.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxcompshad-$pkgver-2.tar.gz + http://64.34.161.181/download/$pkgver/sources/nx-X11-$pkgver-2.tar.gz http://64.34.161.181/download/$pkgver/sources/nxauth-$pkgver-1.tar.gz - http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-3.tar.gz + http://64.34.161.181/download/$pkgver/sources/nxagent-$pkgver-7.tar.gz http://64.34.161.181/download/$pkgver/sources/nxscripts-$pkgver-1.tar.gz \ - gcc44.diff) -sha1sums=('7d359c3e50708c4e774b126cc1e646c5f6ed3c3a' \ - '6ebc7451896293df2b6fb488567d70d686ece9ee' \ - '2a594c6cdb837a2de20079db0702daa2ba1c288f' \ - '20761ad75f930ade86a61fd0082702e94c732533' \ - 'cab44e6d3b67f16502a71ce1b6132c8a85eb78a3' \ - 'a254793a89610a299048928b16b86c82beeb7724' \ - '3d367e0e11baeca8028a73473deace0aec998cd0' \ - '4774fe8157ee599de5e5f436a5dd97579f3e7225' \ - '2fa35646cbf355da3a97c499fcc1484e94af2f6f' \ - 'd3c3ada10da075b935d344ce647fbd71183f80ca') + nx-3.5.0-optflags.patch nx-3.5.0-syslibs.patch nx-3.5.0-libpng15.patch) +sha1sums=('b2ca6cc1bfe1cf667f2fcd77b8fe958d1712748c' \ + '4028078d3318c2287b13b1c81f2ce1ccb69273ad' \ + '91a26af67e455d68822737934a08c9990674408f' \ + '7a2df5e22acfb53120f414760972eac9cc8057c2' \ + '9866dce14f001934360190d1ff03ee5ee4908cd5' \ + 'cf85890dad11cb9edc382d7e540fdc866fe82e04' \ + 'd876bb0e8df7978f3142c92cf804f5b6f486f0c7' \ + '85d1ec4e36ed9899ae964fa532b958c4f514b037' \ + '375c6c7b92f420d0273c4322c4362893c0cc0b09' \ + '5a431f9d29ad917144d485dc6040308227c09360' \ + 'ae96ef6e1d47e00d6cc6770f4b82b0e6e1d13a77' \ + 'e72fccc7b55d0bd16d155e7c225b21034aa604ab') _F_cd_path="./" [ "$CARCH" == "x86_64" ] && CFLAGS="$CFLAGS -fPIC" @@ -39,6 +41,8 @@ _F_cd_path="./" build() { Fcd + export OPT_FLAGS=$CFLAGS + _F_conf_notry="docdir" Fpatchall for i in nxcomp nxcompshad nxproxy do diff --git a/source/xapps-extra/nx/gcc44.diff b/source/xapps-extra/nx/gcc44.diff deleted file mode 100644 index 53574a8..0000000 --- a/source/xapps-extra/nx/gcc44.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- nx-3.3.0/nxcomp/Loop.cpp.orig 2009-05-17 12:22:19.000000000 +0200 -+++ nx-3.3.0/nxcomp/Loop.cpp 2009-05-17 12:22:43.000000000 +0200 -@@ -10979,7 +10979,7 @@ - packMethod == PACK_LOSSLESS || - packMethod == PACK_ADAPTIVE) - { -- char *dash = rindex(opt, '-'); -+ const char *dash = rindex(opt, '-'); - - if (dash != NULL && strlen(dash) == 2 && - *(dash + 1) >= '0' && *(dash + 1) <= '9') diff --git a/source/xapps-extra/nx/nx-3.5.0-libpng15.patch b/source/xapps-extra/nx/nx-3.5.0-libpng15.patch new file mode 100644 index 0000000..c8f2a95 --- /dev/null +++ b/source/xapps-extra/nx/nx-3.5.0-libpng15.patch @@ -0,0 +1,30 @@ +diff -ur nxcomp.orig/Pgn.cpp nxcomp/Pgn.cpp +--- nxcomp.orig/Pgn.cpp 2010-03-01 19:18:59.000000000 +0200 ++++ nxcomp/Pgn.cpp 2011-09-13 16:35:12.000000000 +0300 +@@ -414,7 +414,7 @@ + + png_read_info(pngPtr, infoPtr); + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -565,7 +565,7 @@ + + png_read_info( pngPtr, infoPtr ) ; + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } +@@ -709,7 +709,7 @@ + png_read_info(pngPtr, infoPtr) ; + + +- if (infoPtr -> color_type == PNG_COLOR_TYPE_PALETTE) ++ if (png_get_color_type(pngPtr, infoPtr) == PNG_COLOR_TYPE_PALETTE) + { + png_set_expand(pngPtr); + } diff --git a/source/xapps-extra/nx/nx-3.5.0-optflags.patch b/source/xapps-extra/nx/nx-3.5.0-optflags.patch new file mode 100644 index 0000000..3963ef6 --- /dev/null +++ b/source/xapps-extra/nx/nx-3.5.0-optflags.patch @@ -0,0 +1,187 @@ +diff -up nx-3.5.0/nxcomp/configure~ nx-3.5.0/nxcomp/configure +--- nx-3.5.0/nxcomp/configure~ 2011-06-25 14:44:37.184036869 +0300 ++++ nx-3.5.0/nxcomp/configure 2011-06-25 14:46:20.588641288 +0300 +@@ -1269,8 +1269,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-CXXFLAGS="-O3 -fno-rtti -fno-exceptions" +-CFLAGS="-O3" ++CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" + + + LIBSTATIC="" +diff -up nx-3.5.0/nxcompext/configure~ nx-3.5.0/nxcompext/configure +--- nx-3.5.0/nxcompext/configure~ 2011-06-25 14:44:37.016021263 +0300 ++++ nx-3.5.0/nxcompext/configure 2011-06-25 14:46:47.551145591 +0300 +@@ -1269,8 +1269,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-CXXFLAGS="-O3" +-CFLAGS="-O3" + + + LIBSTATIC="" +diff -up nx-3.5.0/nxcompshad/configure~ nx-3.5.0/nxcompshad/configure +--- nx-3.5.0/nxcompshad/configure~ 2011-06-25 14:44:37.173035846 +0300 ++++ nx-3.5.0/nxcompshad/configure 2011-06-25 14:48:14.259199114 +0300 +@@ -1269,8 +1269,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-CXXFLAGS="-O3" +-CPPFLAGS="-O3" + + + LIBSTATIC="" +diff -up nx-3.5.0/nxproxy/configure~ nx-3.5.0/nxproxy/configure +--- nx-3.5.0/nxproxy/configure~ 2005-11-11 18:27:30.000000000 +0200 ++++ nx-3.5.0/nxproxy/configure 2011-06-25 14:48:38.700469269 +0300 +@@ -1269,8 +1269,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +-CXXFLAGS="-O3" +-CPPFLAGS="-O3" + + + if test -d "../nx-X11/exports/include" ; then +diff -up nx-3.5.0/nxssh/configure~ nx-3.5.0/nxssh/configure +--- nx-3.5.0/nxssh/configure~ 2007-10-02 20:02:53.000000000 +0300 ++++ nx-3.5.0/nxssh/configure 2011-06-25 14:48:57.942256493 +0300 +@@ -4668,7 +4668,6 @@ TEST_SHELL=sh + + + +-CFLAGS="-g -O3" + + NXCOMPINC="-I../nxcomp" + NXCOMPLIBS="-L../nxcomp -lXcomp -lstdc++ -lpng -ljpeg -lz" +diff -up nx-3.5.0/nx-X11/config/cf/host.def~ nx-3.5.0/nx-X11/config/cf/host.def +--- nx-3.5.0/nx-X11/config/cf/host.def~ 2011-06-29 01:14:46.974506460 +0300 ++++ nx-3.5.0/nx-X11/config/cf/host.def 2011-07-01 00:20:11.261694918 +0300 +@@ -497,17 +497,17 @@ XCOMM $XFree86: xc/config/cf/xf86site.de + * -m486 + * + #define DefaultGcc2i386Opt -O2 -fno-strength-reduce +- */ + + #if defined (LinuxArchitecture) + #define DefaultGcc2i386Opt -g -O3 + #endif ++ */ + + /* + * Enable all the optimizations on AMD64. +- */ + + #define DefaultGcc2AMD64Opt -g -O3 GccAliasingArgs ++ */ + + /* + * This allows the GCC warning flags to be set. The default is shown here. +diff -up nx-3.5.0/nx-X11/config/cf/linux.cf~ nx-3.5.0/nx-X11/config/cf/linux.cf +--- nx-3.5.0/nx-X11/config/cf/linux.cf~ 2005-10-21 22:10:27.000000000 +0300 ++++ nx-3.5.0/nx-X11/config/cf/linux.cf 2011-06-29 01:09:13.799185571 +0300 +@@ -837,7 +837,7 @@ InstallNamedTargetNoClobber(install,file + #ifdef Arm32Architecture + # define DefaultCCOptions + # ifndef OptimizedCDebugFlags +-# define OptimizedCDebugFlags -O3 ++# define OptimizedCDebugFlags $(RPM_CFLAGS) + # endif + # define LinuxMachineDefines -D__arm__ -D__arm32__ -U__arm -Uarm + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +@@ -845,7 +845,7 @@ InstallNamedTargetNoClobber(install,file + #endif /* Arm32Achitecture */ + + #ifdef HPArchitecture +-# define OptimizedCDebugFlags -O2 GccAliasingArgs ++# define OptimizedCDebugFlags $(RPM_CFLAGS) GccAliasingArgs + # define LinuxMachineDefines -D__hppa__ + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME + # define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines +@@ -909,7 +909,7 @@ InstallNamedTargetNoClobber(install,file + + #ifdef s390Architecture + # ifndef OptimizedCDebugFlags +-# define OptimizedCDebugFlags -O2 -fomit-frame-pointer GccAliasingArgs ++# define OptimizedCDebugFlags $(RPM_CFLAGS) GccAliasingArgs + # endif + # define LinuxMachineDefines -D__s390__ + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +@@ -918,7 +918,7 @@ InstallNamedTargetNoClobber(install,file + + #ifdef s390xArchitecture + /*#define DefaultCCOptions -fsigned-char */ +-#define OptimizedCDebugFlags -O3 -fomit-frame-pointer ++#define OptimizedCDebugFlags $(RPM_CFLAGS) + #define LinuxMachineDefines -D__s390x__ + #define ServerOSDefines XFree86ServerOSDefines -DDDXTIME + #define ServerExtraDefines -DGCCUSESGAS XFree86ServerDefines -D_XSERVER64 +@@ -926,7 +926,7 @@ InstallNamedTargetNoClobber(install,file + + #ifdef SparcArchitecture + # ifndef OptimizedCDebugFlags +-# define OptimizedCDebugFlags -O2 GccAliasingArgs ++# define OptimizedCDebugFlags $(RPM_CFLAGS) GccAliasingArgs + # endif + # define LinuxMachineDefines -D__sparc__ + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +@@ -957,7 +957,7 @@ InstallNamedTargetNoClobber(install,file + # endif + # endif + # ifndef OptimizedCDebugFlags +-# define OptimizedCDebugFlags -O2 SuperHArchOptFlags SuperHEndianFlags GccAliasingArgs ++# define OptimizedCDebugFlags $(RPM_CFLAGS) SuperHArchOptFlags SuperHEndianFlags GccAliasingArgs + # endif + # define LinuxMachineDefines -D__sh__ + # define ServerOSDefines XFree86ServerOSDefines -DDDXTIME +diff -up nx-3.5.0/nx-X11/config/cf/xorg.cf~ nx-3.5.0/nx-X11/config/cf/xorg.cf +--- nx-3.5.0/nx-X11/config/cf/xorg.cf~ 2005-10-03 19:08:44.000000000 +0300 ++++ nx-3.5.0/nx-X11/config/cf/xorg.cf 2011-06-29 01:10:00.860608947 +0300 +@@ -1557,37 +1557,37 @@ XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japane + + #if HasGcc2 && defined(i386Architecture) + # ifndef DefaultGcc2i386Opt +-# define DefaultGcc2i386Opt -O2 -fno-strength-reduce GccAliasingArgs ++# define DefaultGcc2i386Opt $(RPM_CFLAGS) -fno-strength-reduce GccAliasingArgs + # endif + #endif + + #if HasGcc2 && defined(AMD64Architecture) + # ifndef DefaultGcc2AMD64Opt +-# define DefaultGcc2AMD64Opt -O2 -fno-strength-reduce GccAliasingArgs ++# define DefaultGcc2AMD64Opt $(RPM_CFLAGS) -fno-strength-reduce GccAliasingArgs + # endif + #endif + + #if HasGcc2 && defined(AlphaArchitecture) + # ifndef DefaultGcc2AxpOpt +-# define DefaultGcc2AxpOpt -O2 GccAliasingArgs ++# define DefaultGcc2AxpOpt $(RPM_CFLAGS) GccAliasingArgs + # endif + #endif + + #if HasGcc2 && defined(Ppc64Architecture) + # ifndef DefaultGcc2Ppc64Opt +-# define DefaultGcc2Ppc64Opt -O2 GccAliasingArgs ++# define DefaultGcc2Ppc64Opt $(RPM_CFLAGS) GccAliasingArgs + # endif + #endif + + #if HasGcc2 && defined(MipsArchitecture) + # ifndef DefaultGcc2MipsOpt +-# define DefaultGcc2MipsOpt -O2 GccAliasingArgs ++# define DefaultGcc2MipsOpt $(RPM_CFLAGS) GccAliasingArgs + # endif + #endif + + #if HasGcc2 && defined(PpcArchitecture) + # ifndef DefaultGcc2PpcOpt +-# define DefaultGcc2PpcOpt -O2 GccAliasingArgs ++# define DefaultGcc2PpcOpt $(RPM_CFLAGS) GccAliasingArgs + # endif + #endif + diff --git a/source/xapps-extra/nx/nx-3.5.0-syslibs.patch b/source/xapps-extra/nx/nx-3.5.0-syslibs.patch new file mode 100644 index 0000000..9e7e68c --- /dev/null +++ b/source/xapps-extra/nx/nx-3.5.0-syslibs.patch @@ -0,0 +1,19 @@ +diff -up nx-3.5.0/nx-X11/config/cf/host.def~ nx-3.5.0/nx-X11/config/cf/host.def +--- nx-3.5.0/nx-X11/config/cf/host.def~ 2011-05-09 16:20:22.000000000 +0300 ++++ nx-3.5.0/nx-X11/config/cf/host.def 2011-06-29 01:13:59.677059431 +0300 +@@ -908,7 +908,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.de + * + #define HasFontconfig NO + */ +-#define HasFontconfig NO + + /* + * To use a Fontconfig library already installed outside the default search +@@ -924,7 +923,6 @@ XCOMM $XFree86: xc/config/cf/xf86site.de + * + #define HasExpat NO + */ +-#define HasExpat NO + + /* + * To use a Expat library already installed outside the default search _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
