diff options
Diffstat (limited to 'kde')
-rw-r--r-- | kde/eigen2/.footprint | 12 | ||||
-rw-r--r-- | kde/eigen2/.md5sum | 2 | ||||
-rwxr-xr-x | kde/eigen2/Pkgfile | 7 | ||||
-rwxr-xr-x | kde/kde/Pkgfile | 4 | ||||
-rw-r--r-- | kde/poppler-qt/.footprint | 13 | ||||
-rw-r--r-- | kde/poppler-qt/.md5sum | 1 | ||||
-rwxr-xr-x | kde/poppler-qt/Pkgfile | 11 | ||||
-rw-r--r-- | kde/poppler-qt/poppler-0.10-bindings.patch | 181 |
8 files changed, 29 insertions, 202 deletions
diff --git a/kde/eigen2/.footprint b/kde/eigen2/.footprint index 3d87f672f..b47086380 100644 --- a/kde/eigen2/.footprint +++ b/kde/eigen2/.footprint @@ -9,6 +9,7 @@ drwxr-xr-x root/root opt/kde/include/eigen2/Eigen/ -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/Geometry -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/LU -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/LeastSquares +-rw-r--r-- root/root opt/kde/include/eigen2/Eigen/NewStdVector -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/QR -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/QtAlignedMalloc -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/SVD @@ -117,6 +118,7 @@ drwxr-xr-x root/root opt/kde/include/eigen2/Eigen/src/Sparse/ -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/src/Sparse/SparseCwise.h -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h +-rw-r--r-- root/root opt/kde/include/eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/src/Sparse/SparseDot.h -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/src/Sparse/SparseFlagged.h -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/src/Sparse/SparseFuzzy.h @@ -134,3 +136,13 @@ drwxr-xr-x root/root opt/kde/include/eigen2/Eigen/src/Sparse/ -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/src/Sparse/TaucsSupport.h -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/src/Sparse/TriangularSolver.h -rw-r--r-- root/root opt/kde/include/eigen2/Eigen/src/Sparse/UmfPackSupport.h +drwxr-xr-x root/root opt/kde/include/eigen2/unsupported/ +drwxr-xr-x root/root opt/kde/include/eigen2/unsupported/Eigen/ +-rw-r--r-- root/root opt/kde/include/eigen2/unsupported/Eigen/IterativeSolvers +drwxr-xr-x root/root opt/kde/include/eigen2/unsupported/Eigen/src/ +drwxr-xr-x root/root opt/kde/include/eigen2/unsupported/Eigen/src/IterativeSolvers/ +-rw-r--r-- root/root opt/kde/include/eigen2/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h +-rw-r--r-- root/root opt/kde/include/eigen2/unsupported/Eigen/src/IterativeSolvers/IterationController.h +drwxr-xr-x root/root opt/kde/share/ +drwxr-xr-x root/root opt/kde/share/pkgconfig/ +-rw-r--r-- root/root opt/kde/share/pkgconfig/eigen2.pc diff --git a/kde/eigen2/.md5sum b/kde/eigen2/.md5sum index c5b831c86..8bda6dc79 100644 --- a/kde/eigen2/.md5sum +++ b/kde/eigen2/.md5sum @@ -1 +1 @@ -b2c34144943671a8689b6fab20c52836 eigen-2.0.2.tar.bz2 +60fc0cc5135f6e7a8c87e356119eed06 2.0.11.tar.bz2 diff --git a/kde/eigen2/Pkgfile b/kde/eigen2/Pkgfile index 5c8dae462..c63c7d4d9 100755 --- a/kde/eigen2/Pkgfile +++ b/kde/eigen2/Pkgfile @@ -5,12 +5,11 @@ # Depends on: cmake name=eigen2 -version=2.0.2 +version=2.0.11 release=1 -source=(http://download.tuxfamily.org/eigen/eigen-$version.tar.bz2) - +source=(http://bitbucket.org/eigen/eigen/get/$version.tar.bz2) build() { - cd eigen-$version + cd eigen mkdir build cd build cmake -DCMAKE_INSTALL_PREFIX=$KDE_PREFIX .. diff --git a/kde/kde/Pkgfile b/kde/kde/Pkgfile index 80629df24..a1ed48785 100755 --- a/kde/kde/Pkgfile +++ b/kde/kde/Pkgfile @@ -2,7 +2,11 @@ # URL: http://www.kde.org/ # Maintainer: NuTyX packager team # Packager: lesibel at free dot fr +<<<<<<< HEAD # Depends on: curl, xorg, kdelibs, kdepimlibs, kdeadmin, kdegraphics, kdemultimedia, kdeutils, kdenetwork, kde-l10n-fr, kdebase, kdepim, kdepim-runtime, kdeplasma-addons, kdetoys, kdebindings, phonon, desktop-file-utils, xorg, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, eigen, libspectre +======= +# Depends on: xorg, kdelibs, kdepimlibs, kdeadmin, kdegraphics, kdemultimedia, kdeutils, kdegames, kdenetwork, kde-l10n-fr, kdebase, kdepim, kdeplasma-addons, kdetoys, kdebindings, phonon-xine, k3b, kdesdk, amarok, desktop-file-utils, xorg, shared-mime-info, nas, atk, xine-lib, taglib, qimageblitz, pilot-link, gnokii, libical, akonadi, gpgme, boost, lcms, oxygen-icons, soprano, strigi, eigen, eigen2, gestpkg +>>>>>>> nutyx-2009/master name=kde version=4.4.0 diff --git a/kde/poppler-qt/.footprint b/kde/poppler-qt/.footprint index 08b9b6067..5ae2c4a59 100644 --- a/kde/poppler-qt/.footprint +++ b/kde/poppler-qt/.footprint @@ -10,25 +10,14 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/pdftotext drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/poppler/ -drwxr-xr-x root/root usr/include/poppler/qt4/ --rw-r--r-- root/root usr/include/poppler/qt4/poppler-annotation.h --rw-r--r-- root/root usr/include/poppler/qt4/poppler-export.h --rw-r--r-- root/root usr/include/poppler/qt4/poppler-form.h --rw-r--r-- root/root usr/include/poppler/qt4/poppler-link.h --rw-r--r-- root/root usr/include/poppler/qt4/poppler-optcontent.h --rw-r--r-- root/root usr/include/poppler/qt4/poppler-page-transition.h --rw-r--r-- root/root usr/include/poppler/qt4/poppler-qt4.h drwxr-xr-x root/root usr/lib/ -rwxr-xr-x root/root usr/lib/libpoppler-qt4.la -lrwxrwxrwx root/root usr/lib/libpoppler-qt4.so -> libpoppler-qt4.so.3.2.0 -lrwxrwxrwx root/root usr/lib/libpoppler-qt4.so.3 -> libpoppler-qt4.so.3.2.0 --rwxr-xr-x root/root usr/lib/libpoppler-qt4.so.3.2.0 -rwxr-xr-x root/root usr/lib/libpoppler.la lrwxrwxrwx root/root usr/lib/libpoppler.so -> libpoppler.so.6.0.0 lrwxrwxrwx root/root usr/lib/libpoppler.so.6 -> libpoppler.so.6.0.0 -rwxr-xr-x root/root usr/lib/libpoppler.so.6.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ --rw-r--r-- root/root usr/lib/pkgconfig/poppler-qt4.pc +-rw-r--r-- root/root usr/lib/pkgconfig/poppler-cairo.pc -rw-r--r-- root/root usr/lib/pkgconfig/poppler-splash.pc -rw-r--r-- root/root usr/lib/pkgconfig/poppler.pc drwxr-xr-x root/root usr/share/ diff --git a/kde/poppler-qt/.md5sum b/kde/poppler-qt/.md5sum index 7256dc5a2..e5781d60d 100644 --- a/kde/poppler-qt/.md5sum +++ b/kde/poppler-qt/.md5sum @@ -1,2 +1 @@ -3f828a8372687c6c0ca88925ff4f5036 poppler-0.10-bindings.patch 4923c1d7b08f8eabe1b6a53d3dcb93ee poppler-0.13.0.tar.gz diff --git a/kde/poppler-qt/Pkgfile b/kde/poppler-qt/Pkgfile index d9a2f3c44..e9e56b94d 100755 --- a/kde/poppler-qt/Pkgfile +++ b/kde/poppler-qt/Pkgfile @@ -6,10 +6,10 @@ name=poppler-qt version=0.13.0 -release=1 +release=2 source=(http://poppler.freedesktop.org/poppler-$version.tar.gz) -build() +build() { cd poppler-$version libtoolize --force --copy AT_M4DIR="m4" autoreconf -i @@ -29,5 +29,10 @@ build() make -C poppler libpoppler.la libpoppler-cairo.la libpoppler-arthur.la make make prefix=$PKG/usr install - rm -f $PKG/usr/lib/pkgconfig/poppler-cairo.pc + + rm -rf $PKG/usr/include/poppler/{glib,qt3,qt4} + rm -f $PKG/usr/lib/libpoppler-{glib,qt,qt4}.so* + rm -f $PKG/usr/lib/pkgconfig/poppler-{glib,qt,qt4}.pc + rm -rf $PKG/usr/share/gtk-doc } + diff --git a/kde/poppler-qt/poppler-0.10-bindings.patch b/kde/poppler-qt/poppler-0.10-bindings.patch deleted file mode 100644 index e44a262c0..000000000 --- a/kde/poppler-qt/poppler-0.10-bindings.patch +++ /dev/null @@ -1,181 +0,0 @@ -diff -ruN poppler-0.10.0/Makefile.am poppler-0.10.0-bindings/Makefile.am ---- poppler-0.10.0/Makefile.am 2008-09-09 23:46:50.000000000 +0200 -+++ poppler-0.10.0-bindings/Makefile.am 2008-11-08 00:03:17.000000000 +0100 -@@ -29,7 +29,7 @@ - utils_subdir = utils - endif - --SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir) -+SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir) - - EXTRA_DIST = \ - README-XPDF \ -@@ -40,9 +40,6 @@ - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = \ -- poppler.pc \ -- $(cairo_pc_file) \ -- $(splash_pc_file) \ - $(glib_pc_file) \ - $(qt_pc_file) \ - $(qt4_pc_file) -diff -ruN poppler-0.10.0/glib/Makefile.am poppler-0.10.0-bindings/glib/Makefile.am ---- poppler-0.10.0/glib/Makefile.am 2008-09-27 17:21:45.000000000 +0200 -+++ poppler-0.10.0-bindings/glib/Makefile.am 2008-11-08 00:03:17.000000000 +0100 -@@ -87,7 +87,7 @@ - poppler-private.h - - libpoppler_glib_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(POPPLER_GLIB_LIBS) \ - $(GDK_LIBS) \ - $(FREETYPE_LIBS) \ -@@ -103,7 +103,7 @@ - test-poppler-glib.cc - - test_poppler_glib_LDADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - libpoppler-glib.la \ - $(POPPLER_GLIB_LIBS) \ - $(GDK_LIBS) \ -diff -ruN poppler-0.10.0/glib/demo/Makefile.am poppler-0.10.0-bindings/glib/demo/Makefile.am ---- poppler-0.10.0/glib/demo/Makefile.am 2008-08-24 18:19:55.000000000 +0200 -+++ poppler-0.10.0-bindings/glib/demo/Makefile.am 2008-11-08 00:03:17.000000000 +0100 -@@ -36,5 +36,5 @@ - - LDADD = \ - $(top_builddir)/glib/libpoppler-glib.la \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(GTK_TEST_LIBS) -diff -ruN poppler-0.10.0/glib/reference/Makefile.am poppler-0.10.0-bindings/glib/reference/Makefile.am ---- poppler-0.10.0/glib/reference/Makefile.am 2008-07-24 22:45:05.000000000 +0200 -+++ poppler-0.10.0-bindings/glib/reference/Makefile.am 2008-11-08 00:03:17.000000000 +0100 -@@ -73,7 +73,7 @@ - $(GDK_CFLAGS) \ - $(FREETYPE_CFLAGS) - --GTKDOC_LIBS=$(top_builddir)/poppler/libpoppler.la \ -+GTKDOC_LIBS=-lpoppler \ - $(top_builddir)/glib/libpoppler-glib.la \ - $(POPPLER_GLIB_LIBS) \ - $(FREETYPE_LIBS) \ -diff -ruN poppler-0.10.0/qt/Makefile.am poppler-0.10.0-bindings/qt/Makefile.am ---- poppler-0.10.0/qt/Makefile.am 2008-07-24 22:45:05.000000000 +0200 -+++ poppler-0.10.0-bindings/qt/Makefile.am 2008-11-08 00:03:17.000000000 +0100 -@@ -24,7 +24,7 @@ - poppler-private.h - - libpoppler_qt_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(POPPLER_QT_LIBS) \ - $(FREETYPE_LIBS) \ - $(FONTCONFIG_LIBS) -@@ -41,7 +41,7 @@ - test-poppler-qt.cpp - - test_poppler_qt_LDADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - libpoppler-qt.la \ - $(POPPLER_QT_LIBS) \ - $(FREETYPE_LIBS) -diff -ruN poppler-0.10.0/qt4/demos/Makefile.am poppler-0.10.0-bindings/qt4/demos/Makefile.am ---- poppler-0.10.0/qt4/demos/Makefile.am 2008-07-24 22:45:06.000000000 +0200 -+++ poppler-0.10.0-bindings/qt4/demos/Makefile.am 2008-11-08 00:05:09.000000000 +0100 -@@ -7,7 +7,7 @@ - $(POPPLER_QT4_CFLAGS) - - LDADDS = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(top_builddir)/qt4/src/libpoppler-qt4.la \ - $(FONTCONFIG_LIBS) \ - $(POPPLER_QT4_LIBS) -diff -ruN poppler-0.10.0/qt4/src/Makefile.am poppler-0.10.0-bindings/qt4/src/Makefile.am ---- poppler-0.10.0/qt4/src/Makefile.am 2008-09-10 00:02:49.000000000 +0200 -+++ poppler-0.10.0-bindings/qt4/src/Makefile.am 2008-11-08 00:03:17.000000000 +0100 -@@ -52,7 +52,7 @@ - poppler-private.h - - libpoppler_qt4_la_LIBADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(FONTCONFIG_LIBS) \ - $(POPPLER_QT4_LIBS) - -diff -ruN poppler-0.10.0/qt4/tests/Makefile.am poppler-0.10.0-bindings/qt4/tests/Makefile.am ---- poppler-0.10.0/qt4/tests/Makefile.am 2008-09-05 18:41:33.000000000 +0200 -+++ poppler-0.10.0-bindings/qt4/tests/Makefile.am 2008-11-08 00:03:17.000000000 +0100 -@@ -7,7 +7,7 @@ - $(POPPLER_QT4_CFLAGS) - - LDADDS = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(top_builddir)/qt4/src/libpoppler-qt4.la \ - $(FONTCONFIG_LIBS) \ - $(POPPLER_QT4_LIBS) -diff -ruN poppler-0.10.0/test/Makefile.am poppler-0.10.0-bindings/test/Makefile.am ---- poppler-0.10.0/test/Makefile.am 2008-10-06 19:35:46.000000000 +0200 -+++ poppler-0.10.0-bindings/test/Makefile.am 2008-11-08 00:05:42.000000000 +0100 -@@ -51,14 +51,14 @@ - gtk-splash-test.cc - - gtk_splash_test_LDADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(GTK_TEST_LIBS) - - gtk_cairo_test_SOURCES = \ - gtk-cairo-test.cc - - gtk_cairo_test_LDADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(top_builddir)/glib/libpoppler-glib.la \ - $(CAIRO_LIBS) \ - $(GTK_TEST_LIBS) \ -@@ -69,7 +69,7 @@ - - pdf_inspector_LDADD = \ - $(top_builddir)/poppler/libpoppler-cairo.la \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(CAIRO_LIBS) \ - $(FREETYPE_LIBS) \ - $(GTK_TEST_LIBS) \ -@@ -80,7 +80,7 @@ - perf-test-preview-dummy.cc - - perf_test_LDADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(FREETYPE_LIBS) \ - $(X_EXTRA_LIBS) - -@@ -88,7 +88,7 @@ - pdf-fullrewrite.cc - - pdf_fullrewrite_LDADD = \ -- $(top_builddir)/poppler/libpoppler.la -+ -lpoppler - - EXTRA_DIST = \ - pdf-operators.c \ -diff -ruN poppler-0.10.0/utils/Makefile.am poppler-0.10.0-bindings/utils/Makefile.am ---- poppler-0.10.0/utils/Makefile.am 2008-09-09 20:55:24.000000000 +0200 -+++ poppler-0.10.0-bindings/utils/Makefile.am 2008-11-08 00:03:17.000000000 +0100 -@@ -29,7 +29,7 @@ - $(ABIWORD_CFLAGS) - - LDADD = \ -- $(top_builddir)/poppler/libpoppler.la \ -+ -lpoppler \ - $(UTILS_LIBS) \ - $(FONTCONFIG_LIBS) - |