Attachment #116504 for bug #158458

View | Details | Raw Unified | Return to bug 158458
Collapse All | Expand All

Lines 6-13 Link Here

(-)editors/pdfedit/Makefile (-9 / +29 lines)
6	#	6	#
7		7
8	PORTNAME= pdfedit	8	PORTNAME= pdfedit
9	PORTVERSION= 0.4.1	9	PORTVERSION= 0.4.5
10	PORTREVISION= 5
11	CATEGORIES= editors	10	CATEGORIES= editors
12	MASTER_SITES= SF	11	MASTER_SITES= SF
13		12
Lines 18-36 Link Here
18	LIB_DEPENDS= boost_filesystem.4:${PORTSDIR}/devel/boost-libs \	17	LIB_DEPENDS= boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
19	t1.5:${PORTSDIR}/devel/t1lib	18	t1.5:${PORTSDIR}/devel/t1lib
20		19
		20	LICENSE= GPLv2
		21	LICENSE_FILE= ${WRKSRC}/doc/LICENSE.GPL
		22
21	USE_BZIP2= yes	23	USE_BZIP2= yes
22	USE_GMAKE= yes
23	USE_PERL5_BUILD=yes
24	USE_QT_VER= 3	24	USE_QT_VER= 3
		25	USE_PERL5_BUILD=yes
		26	USE_GMAKE= yes
25	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
26	CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib" \	28	CONFIGURE_ENV= QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++"
27	QMAKESPEC="${LOCALBASE}/share/qt/mkspecs/freebsd-g++"	29	CONFIGURE_ARGS= --with-t1-library=${LOCALBASE}/lib \
28	MAKE_ENV= ${CONFIGURE_ENV} QTDIR="${LOCALBASE}"	30	--with-t1-includes=${LOCALBASE}/include \
29	CFLAGS+= -I${LOCALBASE}/include	31	--with-parallel-make=off
		32	MAKE_ENV= ${CONFIGURE_ENV}
		33	MAKE_JOBS_SAFE= yes
30		34
31	MAN1= pdfedit.1	35	MAN1= pdfedit.1
32		36
		37	post-patch:
		38	@${REINPLACE_CMD} -e \
		39	's\|-pedantic\|\|g ; \
		40	s\| $$(OPTIM)\|\|g ; \
		41	s\| $$(ARCH)\|\|g ; \
		42	s\| -pipe.*$$\|\|g ; \
		43	s\|^CFLAGS =\|CFLAGS +=\|g ; \
		44	s\|^CXXFLAGS =\|CXXFLAGS +=\|g' ${WRKSRC}/Makefile.flags.in
		45	@${REINPLACE_CMD} -e \
		46	'/QMAKE/s\| make\| $$MAKE\|g' ${WRKSRC}/src/qsa/configure
		47
33	post-install:	48	post-install:
34	${INSTALL_PROGRAM} ${WRKSRC}/src/gui/${PORTNAME} ${PREFIX}/bin	49	.if !defined(NOPORTDOCS)
		50	@${MKDIR} ${DOCSDIR}
		51	.for file in Changelog README doc/AUTHORS
		52	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
		53	.endfor
		54	.endif
35		55
36	.include <bsd.port.mk>	56	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)editors/pdfedit/distinfo (-2 / +2 lines)
1	SHA256 (pdfedit-0.4.1.tar.bz2) = e12c3cb0e12775d296983212f69d66381de0eee6b94cc9a7dc10c1196b719522	1	SHA256 (pdfedit-0.4.5.tar.bz2) = 33ad8d59f4e51d8befd2dc2c577516e16c0cd11ebd3d22fed38233a793c6a4b9
2	SIZE (pdfedit-0.4.1.tar.bz2) = 2958137	2	SIZE (pdfedit-0.4.5.tar.bz2) = 3026130




--- ./Makefile.flags.in.orig	2008-02-20 14:45:18.000000000 -0300
+++ ./Makefile.flags.in	2008-03-10 13:32:13.000000000 -0300
@@ -107,11 +107,11 @@
 EXTRA_GUI_CXXFLAGS = -D CONFIG_DATA_PATH="$(DATA_PATH)"
 
 # same like for compiler stuff we also define 2 levels 
-CONFIG_CFLAGS  	= $(DEBUG) $(OPTIM) $(ARCH) $(WARN) $(C_EXTRA) -pipe 
-CONFIG_CXXFLAGS	= $(DEBUG) $(OPTIM) $(ARCH) $(WARN) $(CXX_EXTRA) $(OBSERVER_CXXFLAGS) -pipe 
+CONFIG_CFLAGS  	= $(DEBUG) $(OPTIM) $(WARN) $(C_EXTRA) -pipe 
+CONFIG_CXXFLAGS	= $(DEBUG) $(OPTIM) $(WARN) $(CXX_EXTRA) $(OBSERVER_CXXFLAGS) -pipe 
 
-CFLAGS = $(CONFIG_CFLAGS)
-CXXFLAGS = $(CONFIG_CXXFLAGS)
+CFLAGS += $(CONFIG_CFLAGS)
+CXXFLAGS += $(CONFIG_CXXFLAGS)
 
 #######################################
 # Absolute paths for all components




--- ./configure.orig	2008-02-24 15:59:23.000000000 -0300
+++ ./configure	2008-03-10 13:27:12.000000000 -0300
@@ -5141,11 +5141,6 @@
                   done
 
             fi
-                        if test "x$link_iostreams" != "xyes"; then
-                                { { echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5
-echo "$as_me: error: Could not link against $ax_lib !" >&2;}
-   { (exit 1); exit 1; }; }
-                        fi
                 fi
 
                 CPPFLAGS="$CPPFLAGS_SAVED"




--- doc/Makefile.orig	2008-12-03 09:16:03.000000000 +0900
+++ doc/Makefile	2011-03-21 20:34:48.000000000 +0900
@@ -18,9 +18,6 @@
 	$(USER_MANUAL_INSTALL_TARGET) \
 	$(DOXYGEN_INSTALL_TARGET) \
 	$(ADVANCED_DOC_INSTALL_TARGET)
-	$(MKDIR) $(INSTALL_ROOT)$(DOC_PATH)/;
-	$(COPY_FILE) LICENSE.GPL ../README ../Changelog AUTHORS README-* \
-		README.cygwin $(INSTALL_ROOT)$(DOC_PATH)
 
 # TODO maybe we should be less brutal here and delete only our files However we
 # have no list of installed doc files. This list is probably too much effort




--- src/kernel/cpdf.cc.orig	2008-02-22 11:42:07.000000000 +0300
+++ src/kernel/cpdf.cc	2009-02-28 05:38:20.000000000 +0300
@@ -2347,7 +2347,7 @@
 		instance->file = file;
 		kernelPrintDbg(debug::DBG_INFO, "Instance created successfully openMode=" << openMode);
 		return instance;
-	}catch(exception &e)
+	}catch(std::exception &e)
 	{
 		kernelPrintDbg(DBG_CRIT, "Pdf instance creation failed. cause="<<e.what());
 		string what=string("CPdf open failed. reason=")+e.what();
@@ -2631,7 +2631,7 @@
 		try
 		{
 			minPos = getNodePosition(*this, newValue, &nodeCountCache);
-		}catch(exception &e)
+		}catch(std::exception &e)
 		{
 			// position can't be determined
 			// no special handling is needed, minPos keeps its value
@@ -2690,7 +2690,7 @@
 				kernelPrintDbg(DBG_WARN, "page with original position="<<i->first<<" is ambiguous. Invalidating.");
 				// page position is ambiguous and so it has to be invalidate
 				i->second->invalidate();
-			}catch(exception & e)
+			}catch(std::exception & e)
 			{
 				kernelPrintDbg(DBG_CRIT, "Unexpected error. cause="<<e.what());
 				assert(!"Possibly bug.");




--- src/gui/base.cc.orig	2010-02-22 10:17:40.000000000 +0900
+++ src/gui/base.cc	2011-03-21 20:36:57.000000000 +0900
@@ -688,7 +688,20 @@
  if (openMode=="readonly") mode=CPdf::ReadOnly;
  if (openMode=="readwrite") mode=CPdf::ReadWrite;
  //Basic mode without asking a password (we do not know how)
- return CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(),mode);
+ boost::shared_ptr<pdfobjects::CPdf> pdf;
+ do {
+   try {
+     pdf = CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(),mode);
+   }catch(PdfOpenException &e) {
+     // try to fallback to readonly mode
+     if (mode >= CPdf::ReadWrite) {
+       mode = CPdf::ReadOnly;
+       continue;
+     }
+     throw e;
+   }
+ }while(!pdf);
+ return pdf;
 }
 
 /** \copydoc loadFromFile */




--- src/gui/pdfutil.cc.orig	2009-04-07 00:24:47.000000000 +0900
+++ src/gui/pdfutil.cc	2011-03-21 20:36:57.000000000 +0900
@@ -451,7 +451,20 @@
  @param askPassword If true, password will be asked for if necessary
 */
 boost::shared_ptr<CPdf> getPdfInstance(QWidget *parent, const QString &filename, CPdf::OpenMode mode, bool askPassword) {
- boost::shared_ptr<CPdf> pdf=CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(), mode);
+ boost::shared_ptr<pdfobjects::CPdf> pdf;
+ do {
+   try {
+     pdf = CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(),mode);
+   }catch(PdfOpenException &e) {
+     // try to fallback to readonly mode
+     if (mode >= CPdf::ReadWrite) {
+       mode = CPdf::ReadOnly;
+       continue;
+     }
+     throw e;
+   }
+ }while(!pdf);
+
  if (askPassword && pdf->needsCredentials()) {
   for(;;) {
    //Ask for password until we either get the right one or user gets bored with retrying




--- src/kernel/cpagecontents.cc.orig	2010-04-30 21:44:30.000000000 +0900
+++ src/kernel/cpagecontents.cc	2011-03-21 20:39:56.000000000 +0900
@@ -379,6 +379,12 @@
 
 	// Get the text
 	libs::Rectangle rec = (rc)? *rc : _page->display()->getPageRect();
+	// if we use rotation 90,270 then we must change the rectangle from which we want the text
+	// accordingly (TODO - verify for all rotations)
+	int rot = _page->getRotation ();
+	if (90 == rot || 270 == rot)
+		std::swap (rec.xright, rec.yright);
+
 	scoped_ptr<GString> gtxt (textDev->getText(rec.xleft, rec.yleft, rec.xright, rec.yright));
 	text = gtxt->getCString();
 }
@@ -540,10 +546,14 @@
 
 
 	CDict image_dict;
-	image_dict.addProperty ("W", CInt (image_size.x));
-	image_dict.addProperty ("H", CInt (image_size.y));
-	image_dict.addProperty ("CS", CName ("RGB"));
-	image_dict.addProperty ("BPC", CInt (8));
+	CInt x (image_size.x);
+	image_dict.addProperty ("W", x);
+	CInt y (image_size.y);
+	image_dict.addProperty ("H", y);
+	CName n ("RGB");
+	image_dict.addProperty ("CS", n);
+	CInt i (8);
+	image_dict.addProperty ("BPC", i);
 	CInlineImage img (image_dict, what);
 	shared_ptr<CInlineImage> inline_image (new CInlineImage (image_dict, what));
 	shared_ptr<InlineImageCompositePdfOperator> BI(new InlineImageCompositePdfOperator (inline_image));

Lines 1-11 Link Here

(-)editors/pdfedit/files/patch-src__qsa__configure (-11 lines)
1	--- ./src/qsa/configure.orig 2008-01-16 10:50:31.000000000 -0300
2	+++ ./src/qsa/configure 2008-03-10 13:36:40.000000000 -0300
3	@@ -15,7 +15,7 @@
4	# invoke 2nd stage
5	echo Building second stage2 configure
6	cd configure2
7	-$QMAKE && make > /dev/null
8	+$QMAKE && $MAKE > /dev/null
9	if [ $? -gt 0 -o ! -x configure2 ];
10	then
11	echo Failed to build




--- src/tools/pdf_to_text.cc.orig	2010-04-23 15:58:36.000000000 +0900
+++ src/tools/pdf_to_text.cc	2011-03-21 20:37:12.000000000 +0900
@@ -47,6 +47,14 @@
 	struct _textify {
 		string operator () (shared_ptr<CPage> page)
 		{
+			// Update display params to use media box not default page rect (DEFAULT_PAGE_RX, DEFAULT_PAGE_RY)
+			// TODO upsidedown? get/set
+			DisplayParams dp;
+			dp.useMediaBox = gTrue;
+			dp.crop = gFalse;
+			dp.rotate = page->getRotation ();
+			page->setDisplayParams (dp);
+
 			string text;
 			static const std::string encoding="UTF-8";
 			page->getText (text, &encoding);

Lines 7-10 Link Here

(-)editors/pdfedit/pkg-descr (-1 / +1 lines)
7	Target platform are operating systems of Unix type (Linux, BSD, ...), we are	7	Target platform are operating systems of Unix type (Linux, BSD, ...), we are
8	using C++, XPDF, QT3 and QSA.	8	using C++, XPDF, QT3 and QSA.
9		9
10	WWW: http://pdfedit.petricek.net/	10	WWW: http://pdfedit.cz/




bin/pdfedit
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/Changelog
%%PORTDOCS%%%%DOCSDIR%%/README
%%DOCSDIR%%/README
%%DOCSDIR%%/README-Tango
%%DOCSDIR%%/README.cygwin
%%DOCSDIR%%/gui/images/command_options_cmdedit.png
%%DOCSDIR%%/gui/images/options_commandline.png
%%DOCSDIR%%/gui/images/options_editor.png
%%DOCSDIR%%/gui/images/options_execute.png
%%DOCSDIR%%/gui/images/options_lookandfeel.png
%%DOCSDIR%%/gui/images/options_objecttree.png
%%DOCSDIR%%/gui/images/options_paths.png
%%DOCSDIR%%/gui/images/options_toolbars.png
%%DOCSDIR%%/gui/images/pagespace.png
%%DOCSDIR%%/gui/images/pdfedit.png
%%DOCSDIR%%/gui/images/propedit_all.png
%%DOCSDIR%%/gui/images/propedit_catalog.png
%%DOCSDIR%%/gui/images/propedit_edit.png
%%DOCSDIR%%/gui/images/propedit_edit_add.png
%%DOCSDIR%%/gui/images/propedit_edit_del.png
%%DOCSDIR%%/gui/images/propedit_edit_ref.png
%%DOCSDIR%%/gui/images/propedit_gfx_selection.png
%%DOCSDIR%%/gui/images/propedit_impor.png
%%DOCSDIR%%/gui/images/propedit_multiselection.png
%%DOCSDIR%%/gui/images/propedit_op_desc.png
%%DOCSDIR%%/gui/images/propedit_op_modes.png
%%DOCSDIR%%/gui/images/propedit_opt_editor.png
%%DOCSDIR%%/gui/images/propedit_opt_objtree.png
%%DOCSDIR%%/gui/images/propedit_outlines.png
%%DOCSDIR%%/gui/images/propedit_pages.png
%%DOCSDIR%%/gui/images/propedit_rclick.png
%%DOCSDIR%%/gui/images/propedit_stream.png
%%DOCSDIR%%/gui/images/propedit_text_selection.png
%%DOCSDIR%%/gui/images/theme1.png
%%DOCSDIR%%/gui/images/theme2.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_addFont.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_dashpattern.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_editPageMetrics.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_extractedText.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_findText.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/insert_pages.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_edit.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_file.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_help.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_page.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_tools.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_view.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_draw.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_dynamic.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_main.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_operator.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_page.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_revision.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_selectionmode.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_text.png
%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_treeview.png
%%DOCSDIR%%/images/filedialog.png
%%DOCSDIR%%/images/inputitem.png
%%DOCSDIR%%/images/inputtext.png
%%DOCSDIR%%/images/messageb1.png
%%DOCSDIR%%/images/pdfedit.png
%%DOCSDIR%%/images/qchkbox-w.png
%%DOCSDIR%%/images/qcombo1-w.png
%%DOCSDIR%%/images/qgrpbox-w.png
%%DOCSDIR%%/images/qlined-w.png
%%DOCSDIR%%/images/qradiobt-w.png
%%DOCSDIR%%/images/qsdateed.png
%%DOCSDIR%%/images/qspinbox-w.png
%%DOCSDIR%%/images/qstimeed.png
%%DATADIR%%/callback.qs
%%DATADIR%%/delinearize.qs
%%DATADIR%%/dialog_lib.qs
%%DATADIR%%/dialogs.qs
%%DATADIR%%/flatten.qs
%%DATADIR%%/help/cs/index.html
%%DATADIR%%/help/cs/keyboard.html
%%DATADIR%%/help/images/filedialog.png

%%DATADIR%%/icon/draw_rect.png
%%DATADIR%%/icon/expand.png
%%DATADIR%%/icon/first.png
%%DATADIR%%/icon/flatten.png
%%DATADIR%%/icon/help.png
%%DATADIR%%/icon/hicolor/about.png
%%DATADIR%%/icon/hicolor/add_text.png

%%DATADIR%%/lang/pdfedit_cs.qm
%%DATADIR%%/lang/pdfedit_de.qm
%%DATADIR%%/lang/pdfedit_es.qm
%%DATADIR%%/lang/pdfedit_fr.qm
%%DATADIR%%/lang/pdfedit_ru.qm
%%DATADIR%%/lang/pdfedit_sk.qm
%%DATADIR%%/lang/pdfedit_zh_TW.qm
%%DATADIR%%/menu.qs
%%DATADIR%%/mode.conf
%%DATADIR%%/operator.hint

%%DATADIR%%/pdfeditrc
%%DATADIR%%/pdfoperator.qs
%%DATADIR%%/scripts/delinearize.qs
%%DATADIR%%/scripts/flatten.qs
%%DATADIR%%/scripts/pdftoxml.qs
%%DATADIR%%/scripts/update.qs
%%DATADIR%%/test.qs

@dirrm %%DATADIR%%/help/cs
@dirrm %%DATADIR%%/help
@dirrm %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DOCSDIR%%/gui/menuAndToolbarsFun/images
@dirrm %%DOCSDIR%%/gui/menuAndToolbarsFun
@dirrm %%DOCSDIR%%/gui/images
@dirrm %%DOCSDIR%%/gui
@dirrm %%DOCSDIR%%

Return to bug 158458

Lines 1-18 Link Here

(-)editors/pdfedit/files/patch-Makefile.flags.in (-18 lines)
1	--- ./Makefile.flags.in.orig 2008-02-20 14:45:18.000000000 -0300
2	+++ ./Makefile.flags.in 2008-03-10 13:32:13.000000000 -0300
3	@@ -107,11 +107,11 @@
4	EXTRA_GUI_CXXFLAGS = -D CONFIG_DATA_PATH="$(DATA_PATH)"
5
6	# same like for compiler stuff we also define 2 levels
7	-CONFIG_CFLAGS = $(DEBUG) $(OPTIM) $(ARCH) $(WARN) $(C_EXTRA) -pipe
8	-CONFIG_CXXFLAGS = $(DEBUG) $(OPTIM) $(ARCH) $(WARN) $(CXX_EXTRA) $(OBSERVER_CXXFLAGS) -pipe
9	+CONFIG_CFLAGS = $(DEBUG) $(OPTIM) $(WARN) $(C_EXTRA) -pipe
10	+CONFIG_CXXFLAGS = $(DEBUG) $(OPTIM) $(WARN) $(CXX_EXTRA) $(OBSERVER_CXXFLAGS) -pipe
11
12	-CFLAGS = $(CONFIG_CFLAGS)
13	-CXXFLAGS = $(CONFIG_CXXFLAGS)
14	+CFLAGS += $(CONFIG_CFLAGS)
15	+CXXFLAGS += $(CONFIG_CXXFLAGS)
16
17	#######################################
18	# Absolute paths for all components

Lines 1-14 Link Here

(-)editors/pdfedit/files/patch-configure (-14 lines)
1	--- ./configure.orig 2008-02-24 15:59:23.000000000 -0300
2	+++ ./configure 2008-03-10 13:27:12.000000000 -0300
3	@@ -5141,11 +5141,6 @@
4	done
5
6	fi
7	- if test "x$link_iostreams" != "xyes"; then
8	- { { echo "$as_me:$LINENO: error: Could not link against $ax_lib !" >&5
9	-echo "$as_me: error: Could not link against $ax_lib !" >&2;}
10	- { (exit 1); exit 1; }; }
11	- fi
12	fi
13
14	CPPFLAGS="$CPPFLAGS_SAVED"

Line 0 Link Here

(-)editors/pdfedit/files/patch-doc__Makefile (+12 lines)
	1	--- doc/Makefile.orig 2008-12-03 09:16:03.000000000 +0900
	2	+++ doc/Makefile 2011-03-21 20:34:48.000000000 +0900
	3	@@ -18,9 +18,6 @@
	4	$(USER_MANUAL_INSTALL_TARGET) \
	5	$(DOXYGEN_INSTALL_TARGET) \
	6	$(ADVANCED_DOC_INSTALL_TARGET)
	7	- $(MKDIR) $(INSTALL_ROOT)$(DOC_PATH)/;
	8	- $(COPY_FILE) LICENSE.GPL ../README ../Changelog AUTHORS README-* \
	9	- README.cygwin $(INSTALL_ROOT)$(DOC_PATH)
	10
	11	# TODO maybe we should be less brutal here and delete only our files However we
	12	# have no list of installed doc files. This list is probably too much effort

Lines 1-29 Link Here

(-)editors/pdfedit/files/patch-src-kernel-cpdf.cc (-29 lines)
1	--- src/kernel/cpdf.cc.orig 2008-02-22 11:42:07.000000000 +0300
2	+++ src/kernel/cpdf.cc 2009-02-28 05:38:20.000000000 +0300
3	@@ -2347,7 +2347,7 @@
4	instance->file = file;
5	kernelPrintDbg(debug::DBG_INFO, "Instance created successfully openMode=" << openMode);
6	return instance;
7	- }catch(exception &e)
8	+ }catch(std::exception &e)
9	{
10	kernelPrintDbg(DBG_CRIT, "Pdf instance creation failed. cause="<<e.what());
11	string what=string("CPdf open failed. reason=")+e.what();
12	@@ -2631,7 +2631,7 @@
13	try
14	{
15	minPos = getNodePosition(*this, newValue, &nodeCountCache);
16	- }catch(exception &e)
17	+ }catch(std::exception &e)
18	{
19	// position can't be determined
20	// no special handling is needed, minPos keeps its value
21	@@ -2690,7 +2690,7 @@
22	kernelPrintDbg(DBG_WARN, "page with original position="<<i->first<<" is ambiguous. Invalidating.");
23	// page position is ambiguous and so it has to be invalidate
24	i->second->invalidate();
25	- }catch(exception & e)
26	+ }catch(std::exception & e)
27	{
28	kernelPrintDbg(DBG_CRIT, "Unexpected error. cause="<<e.what());
29	assert(!"Possibly bug.");

Line 0 Link Here

(-)editors/pdfedit/files/patch-src__gui__base.cc (+24 lines)
	1	--- src/gui/base.cc.orig 2010-02-22 10:17:40.000000000 +0900
	2	+++ src/gui/base.cc 2011-03-21 20:36:57.000000000 +0900
	3	@@ -688,7 +688,20 @@
	4	if (openMode=="readonly") mode=CPdf::ReadOnly;
	5	if (openMode=="readwrite") mode=CPdf::ReadWrite;
	6	//Basic mode without asking a password (we do not know how)
	7	- return CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(),mode);
	8	+ boost::shared_ptr<pdfobjects::CPdf> pdf;
	9	+ do {
	10	+ try {
	11	+ pdf = CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(),mode);
	12	+ }catch(PdfOpenException &e) {
	13	+ // try to fallback to readonly mode
	14	+ if (mode >= CPdf::ReadWrite) {
	15	+ mode = CPdf::ReadOnly;
	16	+ continue;
	17	+ }
	18	+ throw e;
	19	+ }
	20	+ }while(!pdf);
	21	+ return pdf;
	22	}
	23
	24	/** \copydoc loadFromFile */

Line 0 Link Here

(-)editors/pdfedit/files/patch-src__gui__pdfutil.cc (+24 lines)
	1	--- src/gui/pdfutil.cc.orig 2009-04-07 00:24:47.000000000 +0900
	2	+++ src/gui/pdfutil.cc 2011-03-21 20:36:57.000000000 +0900
	3	@@ -451,7 +451,20 @@
	4	@param askPassword If true, password will be asked for if necessary
	5	*/
	6	boost::shared_ptr<CPdf> getPdfInstance(QWidget *parent, const QString &filename, CPdf::OpenMode mode, bool askPassword) {
	7	- boost::shared_ptr<CPdf> pdf=CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(), mode);
	8	+ boost::shared_ptr<pdfobjects::CPdf> pdf;
	9	+ do {
	10	+ try {
	11	+ pdf = CPdf::getInstance(util::convertFromUnicode(filename,util::NAME).c_str(),mode);
	12	+ }catch(PdfOpenException &e) {
	13	+ // try to fallback to readonly mode
	14	+ if (mode >= CPdf::ReadWrite) {
	15	+ mode = CPdf::ReadOnly;
	16	+ continue;
	17	+ }
	18	+ throw e;
	19	+ }
	20	+ }while(!pdf);
	21	+
	22	if (askPassword && pdf->needsCredentials()) {
	23	for(;;) {
	24	//Ask for password until we either get the right one or user gets bored with retrying

Line 0 Link Here

(-)editors/pdfedit/files/patch-src__kernel__cpagecontents.cc (+34 lines)
	1	--- src/kernel/cpagecontents.cc.orig 2010-04-30 21:44:30.000000000 +0900
	2	+++ src/kernel/cpagecontents.cc 2011-03-21 20:39:56.000000000 +0900
	3	@@ -379,6 +379,12 @@
	4
	5	// Get the text
	6	libs::Rectangle rec = (rc)? *rc : _page->display()->getPageRect();
	7	+ // if we use rotation 90,270 then we must change the rectangle from which we want the text
	8	+ // accordingly (TODO - verify for all rotations)
	9	+ int rot = _page->getRotation ();
	10	+ if (90 == rot \|\| 270 == rot)
	11	+ std::swap (rec.xright, rec.yright);
	12	+
	13	scoped_ptr<GString> gtxt (textDev->getText(rec.xleft, rec.yleft, rec.xright, rec.yright));
	14	text = gtxt->getCString();
	15	}
	16	@@ -540,10 +546,14 @@
	17
	18
	19	CDict image_dict;
	20	- image_dict.addProperty ("W", CInt (image_size.x));
	21	- image_dict.addProperty ("H", CInt (image_size.y));
	22	- image_dict.addProperty ("CS", CName ("RGB"));
	23	- image_dict.addProperty ("BPC", CInt (8));
	24	+ CInt x (image_size.x);
	25	+ image_dict.addProperty ("W", x);
	26	+ CInt y (image_size.y);
	27	+ image_dict.addProperty ("H", y);
	28	+ CName n ("RGB");
	29	+ image_dict.addProperty ("CS", n);
	30	+ CInt i (8);
	31	+ image_dict.addProperty ("BPC", i);
	32	CInlineImage img (image_dict, what);
	33	shared_ptr<CInlineImage> inline_image (new CInlineImage (image_dict, what));
	34	shared_ptr<InlineImageCompositePdfOperator> BI(new InlineImageCompositePdfOperator (inline_image));

Line 0 Link Here

(-)editors/pdfedit/files/patch-src__tools__pdf_to_text.cc (+17 lines)
	1	--- src/tools/pdf_to_text.cc.orig 2010-04-23 15:58:36.000000000 +0900
	2	+++ src/tools/pdf_to_text.cc 2011-03-21 20:37:12.000000000 +0900
	3	@@ -47,6 +47,14 @@
	4	struct _textify {
	5	string operator () (shared_ptr<CPage> page)
	6	{
	7	+ // Update display params to use media box not default page rect (DEFAULT_PAGE_RX, DEFAULT_PAGE_RY)
	8	+ // TODO upsidedown? get/set
	9	+ DisplayParams dp;
	10	+ dp.useMediaBox = gTrue;
	11	+ dp.crop = gFalse;
	12	+ dp.rotate = page->getRotation ();
	13	+ page->setDisplayParams (dp);
	14	+
	15	string text;
	16	static const std::string encoding="UTF-8";
	17	page->getText (text, &encoding);

Lines 1-78 Link Here

(-)editors/pdfedit/pkg-plist (-76 / +9 lines)
1	bin/pdfedit	1	bin/pdfedit
2	%%DOCSDIR%%/AUTHORS	2	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
3	%%DOCSDIR%%/Changelog	3	%%PORTDOCS%%%%DOCSDIR%%/Changelog
4	%%DOCSDIR%%/LICENSE.GPL	4	%%PORTDOCS%%%%DOCSDIR%%/README
5	%%DOCSDIR%%/README
6	%%DOCSDIR%%/README-Tango
7	%%DOCSDIR%%/README.cygwin
8	%%DOCSDIR%%/gui/images/command_options_cmdedit.png
9	%%DOCSDIR%%/gui/images/options_commandline.png
10	%%DOCSDIR%%/gui/images/options_editor.png
11	%%DOCSDIR%%/gui/images/options_execute.png
12	%%DOCSDIR%%/gui/images/options_lookandfeel.png
13	%%DOCSDIR%%/gui/images/options_objecttree.png
14	%%DOCSDIR%%/gui/images/options_paths.png
15	%%DOCSDIR%%/gui/images/options_toolbars.png
16	%%DOCSDIR%%/gui/images/pagespace.png
17	%%DOCSDIR%%/gui/images/pdfedit.png
18	%%DOCSDIR%%/gui/images/propedit_all.png
19	%%DOCSDIR%%/gui/images/propedit_catalog.png
20	%%DOCSDIR%%/gui/images/propedit_edit.png
21	%%DOCSDIR%%/gui/images/propedit_edit_add.png
22	%%DOCSDIR%%/gui/images/propedit_edit_del.png
23	%%DOCSDIR%%/gui/images/propedit_edit_ref.png
24	%%DOCSDIR%%/gui/images/propedit_gfx_selection.png
25	%%DOCSDIR%%/gui/images/propedit_impor.png
26	%%DOCSDIR%%/gui/images/propedit_multiselection.png
27	%%DOCSDIR%%/gui/images/propedit_op_desc.png
28	%%DOCSDIR%%/gui/images/propedit_op_modes.png
29	%%DOCSDIR%%/gui/images/propedit_opt_editor.png
30	%%DOCSDIR%%/gui/images/propedit_opt_objtree.png
31	%%DOCSDIR%%/gui/images/propedit_outlines.png
32	%%DOCSDIR%%/gui/images/propedit_pages.png
33	%%DOCSDIR%%/gui/images/propedit_rclick.png
34	%%DOCSDIR%%/gui/images/propedit_stream.png
35	%%DOCSDIR%%/gui/images/propedit_text_selection.png
36	%%DOCSDIR%%/gui/images/theme1.png
37	%%DOCSDIR%%/gui/images/theme2.png
38	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_addFont.png
39	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_dashpattern.png
40	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_editPageMetrics.png
41	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_extractedText.png
42	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/dialog_findText.png
43	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/insert_pages.png
44	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_edit.png
45	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_file.png
46	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_help.png
47	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_page.png
48	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_tools.png
49	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/menu_view.png
50	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_draw.png
51	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_dynamic.png
52	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_main.png
53	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_operator.png
54	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_page.png
55	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_revision.png
56	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_selectionmode.png
57	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_text.png
58	%%DOCSDIR%%/gui/menuAndToolbarsFun/images/toolbars_treeview.png
59	%%DOCSDIR%%/images/filedialog.png
60	%%DOCSDIR%%/images/inputitem.png
61	%%DOCSDIR%%/images/inputtext.png
62	%%DOCSDIR%%/images/messageb1.png
63	%%DOCSDIR%%/images/pdfedit.png
64	%%DOCSDIR%%/images/qchkbox-w.png
65	%%DOCSDIR%%/images/qcombo1-w.png
66	%%DOCSDIR%%/images/qgrpbox-w.png
67	%%DOCSDIR%%/images/qlined-w.png
68	%%DOCSDIR%%/images/qradiobt-w.png
69	%%DOCSDIR%%/images/qsdateed.png
70	%%DOCSDIR%%/images/qspinbox-w.png
71	%%DOCSDIR%%/images/qstimeed.png
72	%%DATADIR%%/callback.qs	5	%%DATADIR%%/callback.qs
73	%%DATADIR%%/delinearize.qs	6	%%DATADIR%%/delinearize.qs
74	%%DATADIR%%/dialog_lib.qs	7	%%DATADIR%%/dialog_lib.qs
75	%%DATADIR%%/dialogs.qs	8	%%DATADIR%%/dialogs.qs
		9	%%DATADIR%%/flatten.qs
76	%%DATADIR%%/help/cs/index.html	10	%%DATADIR%%/help/cs/index.html
77	%%DATADIR%%/help/cs/keyboard.html	11	%%DATADIR%%/help/cs/keyboard.html
78	%%DATADIR%%/help/images/filedialog.png	12	%%DATADIR%%/help/images/filedialog.png
Lines 165-170 Link Here
165	%%DATADIR%%/icon/draw_rect.png	99	%%DATADIR%%/icon/draw_rect.png
166	%%DATADIR%%/icon/expand.png	100	%%DATADIR%%/icon/expand.png
167	%%DATADIR%%/icon/first.png	101	%%DATADIR%%/icon/first.png
		102	%%DATADIR%%/icon/flatten.png
168	%%DATADIR%%/icon/help.png	103	%%DATADIR%%/icon/help.png
169	%%DATADIR%%/icon/hicolor/about.png	104	%%DATADIR%%/icon/hicolor/about.png
170	%%DATADIR%%/icon/hicolor/add_text.png	105	%%DATADIR%%/icon/hicolor/add_text.png
Lines 290-297 Link Here
290	%%DATADIR%%/lang/pdfedit_cs.qm	225	%%DATADIR%%/lang/pdfedit_cs.qm
291	%%DATADIR%%/lang/pdfedit_de.qm	226	%%DATADIR%%/lang/pdfedit_de.qm
292	%%DATADIR%%/lang/pdfedit_es.qm	227	%%DATADIR%%/lang/pdfedit_es.qm
		228	%%DATADIR%%/lang/pdfedit_fr.qm
293	%%DATADIR%%/lang/pdfedit_ru.qm	229	%%DATADIR%%/lang/pdfedit_ru.qm
294	%%DATADIR%%/lang/pdfedit_sk.qm	230	%%DATADIR%%/lang/pdfedit_sk.qm
		231	%%DATADIR%%/lang/pdfedit_zh_TW.qm
295	%%DATADIR%%/menu.qs	232	%%DATADIR%%/menu.qs
296	%%DATADIR%%/mode.conf	233	%%DATADIR%%/mode.conf
297	%%DATADIR%%/operator.hint	234	%%DATADIR%%/operator.hint
Lines 299-304 Link Here
299	%%DATADIR%%/pdfeditrc	236	%%DATADIR%%/pdfeditrc
300	%%DATADIR%%/pdfoperator.qs	237	%%DATADIR%%/pdfoperator.qs
301	%%DATADIR%%/scripts/delinearize.qs	238	%%DATADIR%%/scripts/delinearize.qs
		239	%%DATADIR%%/scripts/flatten.qs
302	%%DATADIR%%/scripts/pdftoxml.qs	240	%%DATADIR%%/scripts/pdftoxml.qs
303	%%DATADIR%%/scripts/update.qs	241	%%DATADIR%%/scripts/update.qs
304	%%DATADIR%%/test.qs	242	%%DATADIR%%/test.qs
Lines 311-319 Link Here
311	@dirrm %%DATADIR%%/help/cs	249	@dirrm %%DATADIR%%/help/cs
312	@dirrm %%DATADIR%%/help	250	@dirrm %%DATADIR%%/help
313	@dirrm %%DATADIR%%	251	@dirrm %%DATADIR%%
314	@dirrm %%DOCSDIR%%/images	252	%%PORTDOCS%%@dirrm %%DOCSDIR%%
315	@dirrm %%DOCSDIR%%/gui/menuAndToolbarsFun/images
316	@dirrm %%DOCSDIR%%/gui/menuAndToolbarsFun
317	@dirrm %%DOCSDIR%%/gui/images
318	@dirrm %%DOCSDIR%%/gui
319	@dirrm %%DOCSDIR%%