File abiword-2.9.4-windows.patch of Package mingw32-abiword

Overview Repositories Revisions Requests Users Attributes Meta

File abiword-2.9.4-windows.patch of Package mingw32-abiword (Revision 1e6da542c3d93d84266c0f1dea1adee5)

Currently displaying revision 1e6da542c3d93d84266c0f1dea1adee5 , Show latest

--- abiword-2.9.4/plugins/collab/core/sync/xp/lock.h	2009-04-28 12:42:32.000000000 +0200
+++ abiword-2.9.4/plugins/collab/core/sync/xp/lock.h	2013-06-04 09:41:02.039616075 +0200
@@ -19,7 +19,7 @@
 #ifndef __ABICOLLAB_LOCK__
 #define __ABICOLLAB_LOCK__
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <pthread.h>
 #endif
 
@@ -35,7 +35,7 @@
 public:
 	mutex()
 	{
-#ifdef WIN32
+#ifdef _WIN32
 		repr = CreateMutex(0, FALSE, 0);
 #else
 		pthread_mutex_init(&repr, NULL);
@@ -44,7 +44,7 @@
 
 	~mutex()
 	{
-#ifdef WIN32
+#ifdef _WIN32
 		CloseHandle(repr);
 #else
 		pthread_mutex_destroy(&repr);
@@ -56,7 +56,7 @@
 	mutex( const mutex& );
 	const mutex& operator=( const mutex& );
 
-#ifdef WIN32
+#ifdef _WIN32
 	HANDLE repr;
 #else
 	pthread_mutex_t repr;
@@ -69,7 +69,7 @@
 	scoped_lock(mutex& mutex)
 		: m_mutex(mutex)
 	{
-#ifdef WIN32
+#ifdef _WIN32
 		WaitForSingleObject(m_mutex.repr, INFINITE);
 #else
 		pthread_mutex_lock(&m_mutex.repr);
@@ -78,7 +78,7 @@
 
 	~scoped_lock()
 	{
-#ifdef WIN32
+#ifdef _WIN32
 		ReleaseMutex(m_mutex.repr);
 #else
 		pthread_mutex_unlock(&m_mutex.repr);
--- abiword-2.9.4/plugins/collab/plugin.m4	2012-09-09 11:33:53.000000000 +0200
+++ abiword-2.9.4/plugins/collab/plugin.m4	2013-06-04 09:48:40.663017645 +0200
@@ -191,9 +191,13 @@
 
 if test "$enable_collab_backend_tcp" = "yes" || \
    test "$enable_collab_backend_service" = "yes"; then
-	COLLAB_LIBS="$COLLAB_LIBS -lgcrypt -lpthread"
+	COLLAB_LIBS="$COLLAB_LIBS -lgcrypt"
+	if test "$TOOLKIT" != "win"; then
+		COLLAB_LIBS="$COLLAB_LIBS -lpthread"
+	fi
 fi
 
+
 test "$enable_collab" = "auto" && PLUGINS="$PLUGINS collab"
 
 COLLAB_CFLAGS="$COLLAB_CFLAGS "'${PLUGIN_CFLAGS}'
--- abiword-2.9.4/src/wp/ap/xp/ap_EditMethods.cpp	2012-07-11 12:10:22.000000000 +0200
+++ abiword-2.9.4/src/wp/ap/xp/ap_EditMethods.cpp	2013-06-04 09:27:33.753341136 +0200
@@ -10972,7 +10972,7 @@
 }
 
 
-static bool s_doRDFEditorDlg( FV_View * pView, XAP_Dialog_Id id, AP_Dialog_RDFEditor*& dialogret, bool restrict )
+static bool s_doRDFEditorDlg( FV_View * pView, XAP_Dialog_Id id, AP_Dialog_RDFEditor*& dialogret, bool rstrct )
 {
 	UT_return_val_if_fail(pView, false);
 	XAP_Frame * pFrame = static_cast<XAP_Frame *> ( pView->getParentData());
@@ -10992,7 +10992,7 @@
 	UT_return_val_if_fail(pDialog, false);
 	dialogret = pDialog;
 
-	pDialog->hideRestrictionXMLID( !restrict );
+	pDialog->hideRestrictionXMLID( !rstrct );
 	
 	
 	if(pDialog->isRunning() == true)

Places

File abiword-2.9.4-windows.patch of Package mingw32-abiword (Revision 1e6da542c3d93d84266c0f1dea1adee5)

Places