summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2013-04-04 09:15:10 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2013-04-04 09:15:10 +0000
commit807149860cd3975635486a39f0dd874f06e52351 (patch)
treed5e993fb95c28b4482c2088f8bda468820158ca7 /gnustep-apps/gworkspace
parentTest suite fixed for py3, fixes Bug #462552, by patrick (diff)
downloadhistorical-807149860cd3975635486a39f0dd874f06e52351.tar.gz
historical-807149860cd3975635486a39f0dd874f06e52351.tar.bz2
historical-807149860cd3975635486a39f0dd874f06e52351.zip
Version bump, reported and initial ebuild update by adr in bug #463457. EAPI bump, remove unused files
Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64 Manifest-Sign-Key: 0xC74525F2
Diffstat (limited to 'gnustep-apps/gworkspace')
-rw-r--r--gnustep-apps/gworkspace/ChangeLog13
-rw-r--r--gnustep-apps/gworkspace/Manifest15
-rw-r--r--gnustep-apps/gworkspace/files/gworkspace-0.8.6-popplerkit.patch372
-rw-r--r--gnustep-apps/gworkspace/files/gworkspace-0.8.6-rpath.patch46
-rw-r--r--gnustep-apps/gworkspace/files/gworkspace-0.9.2-rpath-link.patch11
-rw-r--r--gnustep-apps/gworkspace/gworkspace-0.9.2.ebuild44
-rw-r--r--gnustep-apps/gworkspace/metadata.xml3
7 files changed, 77 insertions, 427 deletions
diff --git a/gnustep-apps/gworkspace/ChangeLog b/gnustep-apps/gworkspace/ChangeLog
index 66560303d674..4084c255adae 100644
--- a/gnustep-apps/gworkspace/ChangeLog
+++ b/gnustep-apps/gworkspace/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for gnustep-apps/gworkspace
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/ChangeLog,v 1.39 2012/09/23 07:51:40 phajdan.jr Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/ChangeLog,v 1.40 2013/04/04 09:15:00 voyageur Exp $
+
+*gworkspace-0.9.2 (04 Apr 2013)
+
+ 04 Apr 2013; Bernard Cafarelli <voyageur@gentoo.org>
+ -files/gworkspace-0.8.6-popplerkit.patch,
+ -files/gworkspace-0.8.6-rpath.patch, +gworkspace-0.9.2.ebuild,
+ +files/gworkspace-0.9.2-rpath-link.patch, metadata.xml:
+ Version bump, reported and initial ebuild update by adr in bug #463457. EAPI
+ bump, remove unused files
23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> gworkspace-0.9.1.ebuild:
x86 stable wrt bug #429076
diff --git a/gnustep-apps/gworkspace/Manifest b/gnustep-apps/gworkspace/Manifest
index abf2e9f8ac7e..b1a0db20211a 100644
--- a/gnustep-apps/gworkspace/Manifest
+++ b/gnustep-apps/gworkspace/Manifest
@@ -1,18 +1,19 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX gworkspace-0.8.6-popplerkit.patch 11861 SHA256 eba9ddc0359b144e57d2e02344e79137cb35faf25345994d1832a7e37b619f5b SHA512 199c4b430d78e297bcb26a2c3540d001e607a599d4603e5e2b5232098304781a3a17148e86083f0228a34dd42cdf9e0bf28ca2721a2f8a545c988fa92e2e969d WHIRLPOOL abfb79f745a76bc4fd1ae17886ed1b363ea1419f66b2494a8dd0930533dcf436dc2f15e2d46b88a20c8ac51f52a66ab4ccf79243180a3b7502a2925ccdbe4041
-AUX gworkspace-0.8.6-rpath.patch 2450 SHA256 291d816737a4ec157084016154401d5e44a6649a1249e7a2c98e02a4d272d2d5 SHA512 c88a74e5581550c7d8676147be32e98a3b5032eefabe7e2744d4b9e7727e3c6aea4c8bcf604912ec550a69eea5afddf7a60890a34f330165c3e0ff1bccbed753 WHIRLPOOL 813a97b26e81404d1407f2692894c914e2d7576287fd41a8646ed5769aa50f979f16213b0af52ad5e8497b8b9bdcbd7263be6e4e36e83534b1aa2f34ff7fcb6c
+AUX gworkspace-0.9.2-rpath-link.patch 575 SHA256 d1b7f1e46c8e6543d3542c36476c29f954d96372dd3d8bcdf87a1dcb5849948d SHA512 9219d42093cbc9efac6f2ed2118be0c2bc6cbad75e758a82bcc2af178ddc06c988827998a3f6bcd16f43b02b2e120e84f5ea7da82277217d9faa2ee4c88a3e49 WHIRLPOOL 871e2e00a42b54472d0c56309f1c1eac14416a29f5d7b2385ab5b7d9206f676039a7b741be48e6793fa328349693ef77fb923dd7c57a3b11c99d62d48bb684d9
DIST gworkspace-0.9.0.tar.gz 3789219 SHA256 6655c1570db74dda8dc4f88159f8d251c5bee02da234abe61f35738bab7538fd
DIST gworkspace-0.9.1.tar.gz 3791146 SHA256 c8b1b023621aa83bff3f416485e5c9aa4ecebc90933bf97f3702e0dcfe39cd41 SHA512 7f915ff1b527b088bc91cc062f7178362a2e21bdccb796cad2a76caeb853b56470eb34336a2db6b9adb47977d2fd8a6da9335e8d8a86f15759713772420f43db WHIRLPOOL 69a0f03648d416fa0d4233ac7592291dcbdc111cca68598474e1efab0121a78f3c66453a3b101b2292e43d44f75c9bb1eeb3ef56cea1e0685c840f0558612c37
+DIST gworkspace-0.9.2.tar.gz 4289262 SHA256 5239ef983fd4358e152fcfb5cd1f6c30366d04357c26c74719eb05da849af4fb SHA512 d81476697f83b214c6bed95aa606a8d8fed850dd47ca87d94c151bdb8581d40fde8efa6574f316a6b46c3f2cae3821b9891e984f6d27fc1a155d5c37bd442571 WHIRLPOOL 997eaff5a35dc42f1cce8a1019d1856ce961481698f7e4453655a591e5802ad4bc971968a8c21127b46262eb6d06082afb6f18e4e9c4ef5be4b5c2f3c6bda46c
EBUILD gworkspace-0.9.0.ebuild 936 SHA256 f1c9846a06eb88811a78ac6eead7582b4d210326c99642cf7e5772de362df03c SHA512 8840fd4a04f82e60ada7f300f706b90ab5517ea6364cf0ed6b1a7c1e0636a117c65313f50c8dcf908ed5adc9ac7a3c2bda86ab254e364b2b69c755291c0d4acc WHIRLPOOL 75b1cb47b504d96b25f79bca13f5d2d08a010e1b18b2c222639a10881ad8d0b999d84efc9fc7adf9dc2e17ca78db5d348f820012b04dfeefb2a46b878df2b00a
EBUILD gworkspace-0.9.1.ebuild 943 SHA256 72504de3eb486d7cca5f72e56c1b96169291db0badcfd99e9ff561249e3737ef SHA512 f059a306936e766483373f4902737e8362f2680082f493eded0c0984e6b3798d203d39656cc98572f6a003c040e4476aff9e09dc85e6441d67559e2455e35495 WHIRLPOOL ceac57db49f1a77e02aa92428fbcfef38d151a4b8f85fe34b2396cc810dce9f5d137b3523fc1e01fdbfe041ec2fb2cd0fffd63d6912d3e111f04d3288ec5f203
-MISC ChangeLog 7568 SHA256 fd92aafb5faea1914abd8be7b5ad883044b29c1fdea07f950e869258336e7c26 SHA512 19cfd62e38c310690554666bbfe5106ec1f51bc2fee1c6a25d427648d40cc0461eddf74b6da29d3b07259e3e4b6bca8571ccbf9e6c0d5b19ed6a0ae40576c2fc WHIRLPOOL a3338d5e38b2a573c5eafb921445a7ff993bb3025722d7c9d454fe189d1b169005fae685cd549d850870aaad1db9c6053eab94a63de41aeadf2acc6b534e6f65
-MISC metadata.xml 391 SHA256 406c4ee08f8ef51e0f9d7a826c3024b8e080094ae4c7e9df093f91355609365a SHA512 769926b5dc45535f935b38b8849cf1a43dc6e78cd28e7831d2ae7e2a1e5cb06de8243318c98b2325e6250c3c6ab8e084dfcb81696f020eea51ef0b8f75b51166 WHIRLPOOL 1b7a265b5e0503c544501a8936183e7a78b7d43d415c17df9d73378bf87d8d77117496196a03d9d39376db053208d4a820cda4a42540143a220a49683b9843a0
+EBUILD gworkspace-0.9.2.ebuild 1029 SHA256 4b133c959d4990eaeb7de08e64671cd5ee53fa5b500a6e447bf7314287364031 SHA512 187303efbc1cc2e405f00bf7c2906c2d5f353038e1d70233385aa96d4c9e488801aa3dcd1b1a307b5a895388c2650423b134b04fcb2e9c8b209dbe68fe267d06 WHIRLPOOL 5885c9b2677c0fbc962d8772e16a8949eb6c3080955216ddbeb238d3b65fad18ae299f3ff1ae2f5774aa3b4ce55d5a88e547fe97b5b4bfed733d09e88278d622
+MISC ChangeLog 7929 SHA256 83089d235f79230b4d1215e07ae9e2e94d4bb9a44fefd201dd828bc91badcd02 SHA512 50ed034b030f9b91dbfad2454ef1d2ca90ffd145a0a564328f96c92243a23e5cee4f12083ba8fe52ef03997fca09f6ef511d4e225ea16645b40cff491fc8c498 WHIRLPOOL 1c3e916dfa50bb0e9ffbe3c201d8dfb52f1f4fcf6e916261e0319a2efe0bcac3698ec87b7ef63a7815f3eff1532539b547599ec55508fb9d026aedf546ed30c9
+MISC metadata.xml 486 SHA256 91635f71c089ac2f2c35215ed5aed610868da3f5216657bda621284cd0c44300 SHA512 a6dca1705c4d8cb7c9b95540e9da22270060e9db1311dc42982a2dc921677b89c46408d9cbdafe30e4fab3cd7733919a5398eaf6d0f9be5b4d2e95b37f6373ac WHIRLPOOL 404fcfb4bc0afeee96c3e5f920bdcdd9b67f7412f4f598ff7cafabff93cb180a9d2d778413573a3232c720cf082290adeb7f8c5533e7ddafc003e41116d4421b
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEAREIAAYFAlBev5QACgkQuUQtlDBCeQK2KACdFXJgezMe2mlB1QL8OtPhc+UC
-DXcAnRD/K0Z1GKd1aQ/PZLMDDcO5704D
-=kJao
+iF4EAREIAAYFAlFdRJoACgkQFYEBGcdFJfKq4AEAink9N7j6e7knhYduHXSbLBOI
+swBO4NNSIuAkUXVNPGcA/1rnLIevT5bQrifnM8US2JoPabLAW3qB7Rc/uwMC7pC5
+=y7xk
-----END PGP SIGNATURE-----
diff --git a/gnustep-apps/gworkspace/files/gworkspace-0.8.6-popplerkit.patch b/gnustep-apps/gworkspace/files/gworkspace-0.8.6-popplerkit.patch
deleted file mode 100644
index 4a74b94ee416..000000000000
--- a/gnustep-apps/gworkspace/files/gworkspace-0.8.6-popplerkit.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff -Naur GWorkspace-0.8.5.orig/Inspector/aclocal.m4 GWorkspace-0.8.5/Inspector/aclocal.m4
---- GWorkspace-0.8.5.orig/Inspector/aclocal.m4 2007-06-05 22:13:59.000000000 +0200
-+++ GWorkspace-0.8.5/Inspector/aclocal.m4 2007-06-05 22:21:16.000000000 +0200
-@@ -1,4 +1,4 @@
--AC_DEFUN(AC_CHECK_PDFKIT,[
-+AC_DEFUN(AC_CHECK_POPPLERKIT,[
-
- GNUSTEP_SH_EXPORT_ALL_VARIABLES=yes
- . "$GNUSTEP_MAKEFILES/GNUstep.sh"
-@@ -31,47 +31,47 @@
- LDFLAGS="$LDFLAGS $PREFIX$GNUSTEP_SYSTEM_LIBRARIES $PREFIX$GNUSTEP_LOCAL_LIBRARIES"
- OLD_LIBS="$LIBS"
- LIBS="-lgnustep-gui"
-- AC_MSG_CHECKING([for PDFKit])
-+ AC_MSG_CHECKING([for PopplerKit])
-
-- LIBS="$LIBS -lPDFKit"
-+ LIBS="$LIBS -lPopplerKit"
-
- AC_LINK_IFELSE(
- AC_LANG_PROGRAM(
- [[#include <Foundation/Foundation.h>
- #include <AppKit/AppKit.h>
-- #include <PDFKit/PDFDocument.h>]],
-- [[[[PDFDocument class]];]]),
-+ #include <PopplerKit/PopplerDocument.h>]],
-+ [[[[PopplerDocument class]];]]),
- $1;
-- have_pdfkit=yes,
-+ have_popplerkit=yes,
- $2;
-- have_pdfkit=no)
-+ have_popplerkit=no)
-
- LIBS="$OLD_LIBS"
- CPPFLAGS="$OLD_CPPFLAGS"
- LDFLAGS="$OLD_LDFLAGS"
- CFLAGS="$OLD_CFLAGS"
-
-- AC_MSG_RESULT($have_pdfkit)
-+ AC_MSG_RESULT($have_popplerkit)
- ])
-
-
--AC_DEFUN(AC_CHECK_PDFKIT_DARWIN,[
-- AC_MSG_CHECKING([for PDFKit])
-- PDF_H="PDFKit/PDFDocument.h"
-+AC_DEFUN(AC_CHECK_POPPLERKIT_DARWIN,[
-+ AC_MSG_CHECKING([for PopplerKit])
-+ PDF_H="PopplerKit/PopplerDocument.h"
- PDF_H_PATH="$GNUSTEP_SYSTEM_HEADERS/$PDF_H"
-
- if test -e $PDF_H_PATH; then
-- have_pdfkit=yes
-+ have_popplerkit=yes
- else
- PDF_H_PATH="$GNUSTEP_LOCAL_HEADERS/$PDF_H"
- if test -e $PDF_H_PATH; then
-- have_pdfkit=yes
-+ have_popplerkit=yes
- else
-- have_pdfkit=no
-+ have_popplerkit=no
- fi
- fi
-
-- AC_MSG_RESULT($have_pdfkit)
-+ AC_MSG_RESULT($have_popplerkit)
- ])
-
-
-diff -Naur GWorkspace-0.8.5.orig/Inspector/configure.ac GWorkspace-0.8.5/Inspector/configure.ac
---- GWorkspace-0.8.5.orig/Inspector/configure.ac 2007-06-05 22:13:59.000000000 +0200
-+++ GWorkspace-0.8.5/Inspector/configure.ac 2007-06-05 22:15:43.000000000 +0200
-@@ -55,23 +55,23 @@
- AC_DEFINE_UNQUOTED([FILEPATH], ["$FILE_PATH"], [Path to file])
-
- #--------------------------------------------------------------------
--# We need PDFKit
-+# We need PopplerKit
- #--------------------------------------------------------------------
- case "$target_os" in
- darwin*)
-- AC_CHECK_PDFKIT_DARWIN(have_pdfkit=yes, have_pdfkit=no)
-+ AC_CHECK_POPPLERKIT_DARWIN(have_popplerkit=yes, have_popplerkit=no)
- ;;
- *)
-- AC_CHECK_PDFKIT(have_pdfkit=yes, have_pdfkit=no)
-+ AC_CHECK_POPPLERKIT(have_popplerkit=yes, have_popplerkit=no)
- ;;
- esac
-
--if test "$have_pdfkit" = "no"; then
-- AC_MSG_NOTICE([The PDFKit framework can't be found.])
-+if test "$have_popplerkit" = "no"; then
-+ AC_MSG_NOTICE([The PopplerKit framework can't be found.])
- AC_MSG_NOTICE([The pdf viewer will not be built.])
- fi
-
--AC_SUBST(have_pdfkit)
-+AC_SUBST(have_popplerkit)
-
- AC_CONFIG_FILES([GNUmakefile inspector.make])
- AC_OUTPUT
-diff -Naur GWorkspace-0.8.5.orig/Inspector/ContentViewers/GNUmakefile GWorkspace-0.8.5/Inspector/ContentViewers/GNUmakefile
---- GWorkspace-0.8.5.orig/Inspector/ContentViewers/GNUmakefile 2007-06-05 22:13:59.000000000 +0200
-+++ GWorkspace-0.8.5/Inspector/ContentViewers/GNUmakefile 2007-06-05 22:15:43.000000000 +0200
-@@ -6,7 +6,7 @@
-
- include ../inspector.make
-
--ifneq ($(PDFKIT),no)
-+ifneq ($(POPPLERKIT),no)
- SUBPROJECTS = \
- FolderViewer \
- ImageViewer \
-diff -Naur GWorkspace-0.8.5.orig/Inspector/ContentViewers/GNUmakefile.orig GWorkspace-0.8.5/Inspector/ContentViewers/GNUmakefile.orig
---- GWorkspace-0.8.5.orig/Inspector/ContentViewers/GNUmakefile.orig 1970-01-01 01:00:00.000000000 +0100
-+++ GWorkspace-0.8.5/Inspector/ContentViewers/GNUmakefile.orig 2007-02-23 14:14:24.000000000 +0100
-@@ -0,0 +1,41 @@
-+# Install into the system root by default
-+GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
-+RPM_DISABLE_RELOCATABLE=YES
-+
-+include $(GNUSTEP_MAKEFILES)/common.make
-+
-+include ../inspector.make
-+
-+ifneq ($(PDFKIT),no)
-+SUBPROJECTS = \
-+ FolderViewer \
-+ ImageViewer \
-+ SoundViewer \
-+ AppViewer \
-+ RtfViewer \
-+ PdfViewer \
-+ NSTIFFViewer \
-+ NSRTFViewer \
-+ NSColorViewer \
-+ IBViewViewer
-+else
-+SUBPROJECTS = \
-+ FolderViewer \
-+ ImageViewer \
-+ SoundViewer \
-+ AppViewer \
-+ RtfViewer \
-+ NSTIFFViewer \
-+ NSRTFViewer \
-+ NSColorViewer \
-+ IBViewViewer
-+endif
-+
-+-include GNUmakefile.preamble
-+
-+-include GNUmakefile.local
-+
-+include $(GNUSTEP_MAKEFILES)/aggregate.make
-+
-+-include GNUmakefile.postamble
-+
-diff -Naur GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/GNUmakefile GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/GNUmakefile
---- GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/GNUmakefile 2007-06-05 22:13:59.000000000 +0200
-+++ GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/GNUmakefile 2007-06-05 22:15:43.000000000 +0200
-@@ -11,7 +11,7 @@
-
- OBJCFLAGS += -Wall
-
--PdfViewer_GUI_LIBS += -lPDFKit
-+PdfViewer_GUI_LIBS += -lPopplerKit
-
- PdfViewer_OBJC_FILES = PdfViewer.m
-
-diff -Naur GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/GNUmakefile.orig GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/GNUmakefile.orig
---- GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/GNUmakefile.orig 1970-01-01 01:00:00.000000000 +0100
-+++ GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/GNUmakefile.orig 2007-02-23 14:14:24.000000000 +0100
-@@ -0,0 +1,32 @@
-+# Install into the system root by default
-+GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
-+RPM_DISABLE_RELOCATABLE=YES
-+
-+include $(GNUSTEP_MAKEFILES)/common.make
-+
-+BUNDLE_NAME = PdfViewer
-+BUNDLE_EXTENSION = .inspector
-+
-+PdfViewer_HAS_RESOURCE_BUNDLE = yes
-+
-+OBJCFLAGS += -Wall
-+
-+PdfViewer_GUI_LIBS += -lPDFKit
-+
-+PdfViewer_OBJC_FILES = PdfViewer.m
-+
-+PdfViewer_PRINCIPAL_CLASS = PdfViewer
-+
-+#PdfViewer_LANGUAGES = English
-+PdfViewer_RESOURCE_FILES = Images/* \
-+ InspectorInfo.plist \
-+ Resources/English.lproj
-+
-+#PdfViewer_LOCALIZED_RESOURCE_FILES = Localizable.strings
-+
-+-include GNUmakefile.preamble
-+
-+include $(GNUSTEP_MAKEFILES)/bundle.make
-+
-+-include GNUmakefile.postamble
-+
-diff -Naur GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/PdfViewer.h GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/PdfViewer.h
---- GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/PdfViewer.h 2007-06-05 22:13:59.000000000 +0200
-+++ GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/PdfViewer.h 2007-06-05 22:15:43.000000000 +0200
-@@ -46,8 +46,7 @@
- @class NSTextField;
- @class NSWorkspace;
- @class NSButton;
--@class PDFDocument;
--@class PDFImageRep;
-+@class PopplerDocument;
- @class NSImage;
-
- @interface PdfViewer : NSView <ContentViewersProtocol>
-@@ -62,8 +61,8 @@
- NSButton *editButt;
-
- NSString *pdfPath;
-- PDFDocument *pdfDoc;
-- PDFImageRep *imageRep;
-+ PopplerDocument *pdfDoc;
-+ id <PopplerBufferedRenderer> pdfRenderer;
-
- id <ContentInspectorProtocol>inspector;
- NSFileManager *fm;
-diff -Naur GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/PdfViewer.m GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/PdfViewer.m
---- GWorkspace-0.8.5.orig/Inspector/ContentViewers/PdfViewer/PdfViewer.m 2007-06-05 22:13:59.000000000 +0200
-+++ GWorkspace-0.8.5/Inspector/ContentViewers/PdfViewer/PdfViewer.m 2007-06-05 22:27:13.000000000 +0200
-@@ -23,8 +23,9 @@
- */
-
- #include <AppKit/AppKit.h>
--#include <PDFKit/PDFDocument.h>
--#include <PDFKit/PDFImageRep.h>
-+#include <PopplerKit/PopplerDocument.h>
-+#include <PopplerKit/PopplerSplashRenderer.h>
-+#include <PopplerKit/PopplerCairoImageRenderer.h>
- #include <math.h>
- #include "PdfViewer.h"
-
-@@ -38,7 +39,7 @@
- {
- TEST_RELEASE (pdfPath);
- TEST_RELEASE (pdfDoc);
-- TEST_RELEASE (imageRep);
-+ TEST_RELEASE (pdfRenderer);
- RELEASE (backButt);
- RELEASE (nextButt);
- RELEASE (scroll);
-@@ -158,7 +159,7 @@
-
- - (void)displayPath:(NSString *)path
- {
-- PDFDocument *doc;
-+ PopplerDocument *doc;
-
- ASSIGN (pdfPath, path);
-
-@@ -168,11 +169,14 @@
-
- [editButt setEnabled: NO];
-
-- doc = [PDFDocument documentFromFile: pdfPath];
-+ NS_DURING
-+ doc = [PopplerDocument documentWithPath: pdfPath];
-+ NS_HANDLER
-+ doc = nil;
-+ NS_ENDHANDLER
-
-- if ([doc isOk] && ([doc errorCode] == 0)) {
-+ if (doc) {
- int npages;
-- NSSize imageSize;
- NSBundle *bundle;
- NSString *imagePath;
- NSImage *miniPage;
-@@ -234,13 +238,13 @@
- [matrix sizeToCells];
- RELEASE (miniPage);
-
-- DESTROY (imageRep);
-+ DESTROY (pdfRenderer);
- ASSIGN (pdfDoc, doc);
-
-- imageSize = NSMakeSize([pdfDoc pageWidth: 1],
-- [pdfDoc pageHeight: 1]);
-- imageRep = [[PDFImageRep alloc] initWithDocument: pdfDoc];
-- [imageRep setSize: imageSize];
-+ if ([PopplerCairoImageRenderer isSupported])
-+ pdfRenderer = [[PopplerCairoImageRenderer alloc] initWithDocument: pdfDoc];
-+ else
-+ pdfRenderer = [[PopplerSplashRenderer alloc] initWithDocument: pdfDoc];
-
- } else {
- if (valid) {
-@@ -276,18 +280,21 @@
- NSImage *image = nil;
- int index = [matrix selectedColumn] + 1;
- NSSize imsize = [imageView bounds].size;
-- NSSize unscaledSize = NSMakeSize([pdfDoc pageWidth: index],
-- [pdfDoc pageHeight: index]);
-+ NSSize unscaledSize = [[pdfDoc page: index] size];
-+ NSSize scaledSize = unscaledSize;
-+ float scaleFactor = 1.0;
-+ NSImageRep *imageRep;
-
- if ((imsize.width < unscaledSize.width)
- || (imsize.height < unscaledSize.height)) {
- float rw, rh;
-- NSSize scaledSize;
- float xfactor, yfactor;
-
- rw = imsize.width / unscaledSize.width;
- rh = imsize.height / unscaledSize.height;
-
-+ scaleFactor = rw <= rh ? rw : rh;
-+
- if (rw <= rh) {
- scaledSize.width = unscaledSize.width * rw;
- scaledSize.height = floor(imsize.width * unscaledSize.height / unscaledSize.width + 0.5);
-@@ -295,15 +302,9 @@
- scaledSize.height = unscaledSize.height * rh;
- scaledSize.width = floor(imsize.height * unscaledSize.width / unscaledSize.height + 0.5);
- }
--
-- xfactor = scaledSize.width / unscaledSize.width * PDFResolution;
-- yfactor = scaledSize.height / unscaledSize.height * PDFResolution;
--
-- [imageRep setResolution: (xfactor < yfactor ? xfactor : yfactor)];
- }
-
-- [imageRep setPageNum: index];
--
-+ imageRep = [pdfRenderer renderPage: [pdfDoc page: index] scale: scaleFactor];
- image = [[NSImage alloc] initWithSize: [imageRep size]];
- [image setBackgroundColor: [NSColor whiteColor]];
- [image setScalesWhenResized: YES];
-diff -Naur GWorkspace-0.8.5.orig/Inspector/GNUmakefile.in GWorkspace-0.8.5/Inspector/GNUmakefile.in
---- GWorkspace-0.8.5.orig/Inspector/GNUmakefile.in 2007-06-05 22:13:59.000000000 +0200
-+++ GWorkspace-0.8.5/Inspector/GNUmakefile.in 2007-06-05 22:15:43.000000000 +0200
-@@ -15,9 +15,9 @@
- Inspector_PRINCIPAL_CLASS = Inspector
- Inspector_HAS_RESOURCE_BUNDLE = yes
-
--ifneq ($(PDFKIT),no)
-- Inspector_GUI_LIBS += -lPDFKit
-- ADDITIONAL_LDFLAGS = -lPDFKit
-+ifneq ($(POPPLERKIT),no)
-+ Inspector_GUI_LIBS += -lPopplerKit
-+ ADDITIONAL_LDFLAGS = -lPopplerKit
- endif
-
- Inspector_RESOURCE_FILES = \
-diff -Naur GWorkspace-0.8.5.orig/Inspector/inspector.make.in GWorkspace-0.8.5/Inspector/inspector.make.in
---- GWorkspace-0.8.5.orig/Inspector/inspector.make.in 2007-06-05 22:13:59.000000000 +0200
-+++ GWorkspace-0.8.5/Inspector/inspector.make.in 2007-06-05 22:15:43.000000000 +0200
-@@ -2,6 +2,6 @@
- # Makefile flags and configs to build with the bundle
- #
-
--PDFKIT=@have_pdfkit@
-+POPPLERKIT=@have_popplerkit@
- SH_PATH=@SH_PATH@
- FILE_PATH=@FILE_PATH@
diff --git a/gnustep-apps/gworkspace/files/gworkspace-0.8.6-rpath.patch b/gnustep-apps/gworkspace/files/gworkspace-0.8.6-rpath.patch
deleted file mode 100644
index e2d4e9eb667e..000000000000
--- a/gnustep-apps/gworkspace/files/gworkspace-0.8.6-rpath.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff -Naur GWMetadata.old/gmds/mdextractor/GNUmakefile.preamble GWMetadata/gmds/mdextractor/GNUmakefile.preamble
---- GWMetadata.old/gmds/mdextractor/GNUmakefile.preamble 2007-02-23 14:14:52.000000000 +0100
-+++ GWMetadata/gmds/mdextractor/GNUmakefile.preamble 2007-05-03 14:21:57.000000000 +0200
-@@ -12,6 +12,7 @@
-
- ADDITIONAL_LIB_DIRS += -L../../MDKit/MDKit.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
- ADDITIONAL_LIB_DIRS += -L../../../DBKit/$(GNUSTEP_OBJ_DIR)
-+ADDITIONAL_LIB_DIRS += -Wl,-rpath-link ../../../FSNode/FSNode.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
-
- # Additional LDFLAGS to pass to the linker
- # ADDITIONAL_LDFLAGS +=
-diff -Naur GWMetadata.old/gmds/mdfind/GNUmakefile.preamble GWMetadata/gmds/mdfind/GNUmakefile.preamble
---- GWMetadata.old/gmds/mdfind/GNUmakefile.preamble 2007-02-23 14:14:50.000000000 +0100
-+++ GWMetadata/gmds/mdfind/GNUmakefile.preamble 2007-05-03 14:21:57.000000000 +0200
-@@ -16,6 +16,8 @@
-
- # Additional library directories the linker should search
- ADDITIONAL_LIB_DIRS += -L../../MDKit/MDKit.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
-+ADDITIONAL_LIB_DIRS += -Wl,-rpath-link ../../../FSNode/FSNode.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
-+ADDITIONAL_LIB_DIRS += -Wl,-rpath-link ../../../DBKit/$(GNUSTEP_OBJ_DIR)
-
-
- ADDITIONAL_TOOL_LIBS +=
-diff -Naur GWMetadata.old/GNUmakefile.preamble GWMetadata/GNUmakefile.preamble
---- GWMetadata.old/GNUmakefile.preamble 2007-02-23 14:14:55.000000000 +0100
-+++ GWMetadata/GNUmakefile.preamble 2007-05-03 14:21:57.000000000 +0200
-@@ -15,7 +15,7 @@
- ADDITIONAL_LDFLAGS +=
-
- # Additional library directories the linker should search
--ADDITIONAL_LIB_DIRS +=
-+ADDITIONAL_LIB_DIRS += -Wl,-rpath-link ../../../FSNode/FSNode.framework/Versions/0
-
-
- ADDITIONAL_TOOL_LIBS +=
-diff -Naur GWMetadata.old/MDFinder/GNUmakefile.preamble GWMetadata/MDFinder/GNUmakefile.preamble
---- GWMetadata.old/MDFinder/GNUmakefile.preamble 2007-02-23 14:14:44.000000000 +0100
-+++ GWMetadata/MDFinder/GNUmakefile.preamble 2007-05-03 14:21:57.000000000 +0200
-@@ -13,6 +13,7 @@
-
- ADDITIONAL_LIB_DIRS += -L../MDKit/MDKit.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
- ADDITIONAL_LIB_DIRS += -L../../FSNode/FSNode.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
-+ADDITIONAL_LIB_DIRS += -Wl,-rpath-link ../../DBKit/$(GNUSTEP_OBJ_DIR)
-
- # Additional LDFLAGS to pass to the linker
- # ADDITIONAL_LDFLAGS +=
diff --git a/gnustep-apps/gworkspace/files/gworkspace-0.9.2-rpath-link.patch b/gnustep-apps/gworkspace/files/gworkspace-0.9.2-rpath-link.patch
new file mode 100644
index 000000000000..53bd503e9e46
--- /dev/null
+++ b/gnustep-apps/gworkspace/files/gworkspace-0.9.2-rpath-link.patch
@@ -0,0 +1,11 @@
+--- GWMetadata/MDFinder/GNUmakefile.preamble.orig 2013-04-04 11:05:53.208502021 +0200
++++ GWMetadata/MDFinder/GNUmakefile.preamble 2013-04-04 11:05:55.012501940 +0200
+@@ -13,7 +13,7 @@
+
+ ADDITIONAL_LIB_DIRS += -L../MDKit/MDKit.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+ ADDITIONAL_LIB_DIRS += -L../../FSNode/FSNode.framework/Versions/Current/$(GNUSTEP_TARGET_LDIR)
+-ADDITIONAL_LIB_DIRS += -L../../DBKit/$(GNUSTEP_OBJ_DIR)
++ADDITIONAL_LIB_DIRS += -Wl,-rpath-link ../../DBKit/$(GNUSTEP_OBJ_DIR)
+
+ # Additional LDFLAGS to pass to the linker
+ # ADDITIONAL_LDFLAGS +=
diff --git a/gnustep-apps/gworkspace/gworkspace-0.9.2.ebuild b/gnustep-apps/gworkspace/gworkspace-0.9.2.ebuild
new file mode 100644
index 000000000000..8c87393d893b
--- /dev/null
+++ b/gnustep-apps/gworkspace/gworkspace-0.9.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gworkspace/gworkspace-0.9.2.ebuild,v 1.1 2013/04/04 09:15:00 voyageur Exp $
+
+EAPI=5
+inherit gnustep-2
+
+DESCRIPTION="A workspace manager for GNUstep"
+HOMEPAGE="http://www.gnustep.org/experience/GWorkspace.html"
+SRC_URI="ftp://ftp.gnustep.org/pub/gnustep/usr-apps/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+gwmetadata"
+
+DEPEND="gwmetadata? ( >=gnustep-apps/systempreferences-1.0.1_p24791
+ >=dev-db/sqlite-3.2.8 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-rpath-link.patch
+}
+
+src_configure() {
+ local myconf=""
+ use kernel_linux && myconf="${myconf} --with-inotify"
+ use gwmetadata && myconf="${myconf} --enable-gwmetadata"
+
+ egnustep_env
+ econf ${myconf}
+}
+
+src_install() {
+ egnustep_env
+ egnustep_install
+
+ if use doc;
+ then
+ dodir /usr/share/doc/${PF}
+ cp "${S}"/Documentation/*.pdf "${D}"/usr/share/doc/${PF}
+ fi
+}
diff --git a/gnustep-apps/gworkspace/metadata.xml b/gnustep-apps/gworkspace/metadata.xml
index 0783c19cf4a8..5bdd0028e1b7 100644
--- a/gnustep-apps/gworkspace/metadata.xml
+++ b/gnustep-apps/gworkspace/metadata.xml
@@ -5,4 +5,7 @@
<longdescription>
GWorkspace is the official GNUstep workspace manager. It is a clone of the NeXT workspace manager. GWorkspace is becoming more and more stable every day and it is already ready for daily usage.
</longdescription>
+<use>
+ <flag name='gwmetadata'>Enable the metadata indexing and searching system</flag>
+</use>
</pkgmetadata>