diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
commit | aec9ffe68488d34c02bceb4942b87779f5c460d5 (patch) | |
tree | 5aaa0d61510bf94c4dd5bd751b53f61d39817e96 /testing/nx | |
parent | 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (diff) | |
parent | 9598f5141ea75ffa72a3c7c85639c6f296020ef1 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/projectm/PKGBUILD
community-testing/evas_generic_loaders-svn/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/libextractor/PKGBUILD
community-testing/pdf2djvu/PKGBUILD
community-testing/qtcreator/PKGBUILD
community-testing/qtcreator/qtcreator.desktop
community/galculator/PKGBUILD
community/ristretto/PKGBUILD
core/systemd/PKGBUILD
extra/llvm/PKGBUILD
extra/pyqt/PKGBUILD
extra/python-lxml/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/glew/PKGBUILD
staging/xine-lib/PKGBUILD
testing/calligra/PKGBUILD
testing/gdk-pixbuf2/PKGBUILD
testing/gdm/PKGBUILD
testing/gdm/fix_external_program_directories.patch
testing/glib2/PKGBUILD
testing/gnome-color-manager/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtk3/PKGBUILD
testing/gvfs/PKGBUILD
testing/inkscape/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/networkmanager/PKGBUILD
testing/polkit/PKGBUILD
testing/poppler/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-xdm/PKGBUILD
Diffstat (limited to 'testing/nx')
-rw-r--r-- | testing/nx/nx-cflags.patch | 54 |
1 files changed, 0 insertions, 54 deletions
diff --git a/testing/nx/nx-cflags.patch b/testing/nx/nx-cflags.patch deleted file mode 100644 index 35562939c..000000000 --- a/testing/nx/nx-cflags.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- nxcomp/configure.in.orig 2008-12-18 15:48:09.000000000 +0100 -+++ nxcomp/configure.in 2008-12-18 15:54:14.000000000 +0100 -@@ -7,8 +7,7 @@ - - dnl Set our default compilation flags. - --CXXFLAGS="-O3 -fno-rtti -fno-exceptions" --CFLAGS="-O3" -+CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" - - dnl Reset default linking directives. - ---- nxcompext/configure.in.orig 2008-12-18 15:55:29.000000000 +0100 -+++ nxcompext/configure.in 2008-12-18 15:55:51.000000000 +0100 -@@ -5,11 +5,6 @@ - AC_INIT(NXlib.h) - AC_PREREQ(2.13) - --dnl Reset default compilation flags. -- --CXXFLAGS="-O3" --CFLAGS="-O3" -- - dnl Reset default linking directives. - - LIBSTATIC="" ---- nxcompshad/configure.in.orig 2008-12-18 15:56:13.000000000 +0100 -+++ nxcompshad/configure.in 2008-12-18 15:56:22.000000000 +0100 -@@ -5,11 +5,6 @@ - AC_INIT(Shadow.h) - AC_PREREQ(2.13) - --dnl Reset default compilation flags. -- --CXXFLAGS="-O3" --CPPFLAGS="-O3" -- - dnl Reset default linking directives. - - LIBSTATIC="" ---- nxproxy/configure.in.orig 2008-12-18 15:57:48.000000000 +0100 -+++ nxproxy/configure.in 2008-12-18 15:57:55.000000000 +0100 -@@ -5,11 +5,6 @@ - AC_INIT(Main.c) - AC_PREREQ(2.13) - --dnl Reset default compilation flags. -- --CXXFLAGS="-O3" --CPPFLAGS="-O3" -- - dnl Prefer headers and libraries from nx-X11 if present. - - if test -d "../nx-X11/exports/include" ; then |