summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/libreoffice/ArchLinux.patch11
-rw-r--r--extra/openjdk6/aatext_by_default.diff35
-rw-r--r--extra/swig/swig-deprecated-pycobject.patch92
-rw-r--r--extra/swig/swig-pyslice.patch66
4 files changed, 0 insertions, 204 deletions
diff --git a/extra/libreoffice/ArchLinux.patch b/extra/libreoffice/ArchLinux.patch
deleted file mode 100644
index 2bcf9296d..000000000
--- a/extra/libreoffice/ArchLinux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- patches/dev300/apply 2009-05-07 19:44:13.000000000 +0000
-+++ patches/dev300/apply.new 2009-05-11 18:46:58.108316633 +0000
-@@ -108,7 +108,7 @@
- rpl2: rPathCommon
- rpl2-64: rPathCommon
- # ArchLinux
--ArchLinux: LinuxCommon
-+ArchLinux: LinuxCommon, NotDebian, CairoFonts, Shrink
- # Win32
- Win32 : Win32Common
- # translate.org.za
diff --git a/extra/openjdk6/aatext_by_default.diff b/extra/openjdk6/aatext_by_default.diff
deleted file mode 100644
index 268ea99a9..000000000
--- a/extra/openjdk6/aatext_by_default.diff
+++ /dev/null
@@ -1,35 +0,0 @@
---- openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java.old 2008-01-08 20:23:56.000000000 +0200
-+++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java 2008-02-24 12:39:19.000000000 +0200
-@@ -1875,7 +1875,6 @@
- */
- private static boolean useSystemAAFontSettings() {
- if (!checkedSystemAAFontSettings) {
-- useSystemAAFontSettings = true; /* initially set this true */
- String systemAAFonts = null;
- Toolkit tk = Toolkit.getDefaultToolkit();
- if (tk instanceof SunToolkit) {
-@@ -1883,20 +1882,10 @@
- (String)AccessController.doPrivileged(
- new GetPropertyAction("awt.useSystemAAFontSettings"));
- }
-- if (systemAAFonts != null) {
-- useSystemAAFontSettings =
-- Boolean.valueOf(systemAAFonts).booleanValue();
-- /* If it is anything other than "true", then it may be
-- * a hint name , or it may be "off, "default", etc.
-- */
-- if (!useSystemAAFontSettings) {
-- desktopFontHints = getDesktopAAHintsByName(systemAAFonts);
-- }
-- }
-- /* If its still true, apply the extra condition */
-- if (useSystemAAFontSettings) {
-- useSystemAAFontSettings = lastExtraCondition;
-- }
-+ if (systemAAFonts == null || Boolean.parseBoolean(systemAAFonts))
-+ systemAAFonts = "on";
-+ desktopFontHints = getDesktopAAHintsByName(systemAAFonts);
-+ useSystemAAFontSettings = desktopFontHints != null;
- checkedSystemAAFontSettings = true;
- }
- return useSystemAAFontSettings;
diff --git a/extra/swig/swig-deprecated-pycobject.patch b/extra/swig/swig-deprecated-pycobject.patch
deleted file mode 100644
index 5665252bb..000000000
--- a/extra/swig/swig-deprecated-pycobject.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -up swig-2.0.0/Lib/python/pyrun.swg.rh623854 swig-2.0.0/Lib/python/pyrun.swg
---- swig-2.0.0/Lib/python/pyrun.swg.rh623854 2010-02-28 00:26:02.000000000 +0100
-+++ swig-2.0.0/Lib/python/pyrun.swg 2010-08-17 16:32:16.581604656 +0200
-@@ -45,8 +45,18 @@
- #define SWIG_SetErrorMsg SWIG_Python_SetErrorMsg
- #define SWIG_ErrorType(code) SWIG_Python_ErrorType(code)
- #define SWIG_Error(code, msg) SWIG_Python_SetErrorMsg(SWIG_ErrorType(code), msg)
--#define SWIG_fail goto fail
-+#define SWIG_fail goto fail
-
-+/*
-+ * Python 2.7 and newer and Python 3.1 and newer should use Capsules API instead of
-+ * CObjects API.
-+ */
-+#if ((PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION > 6) || \
-+ (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION > 0))
-+#define USE_CAPSULES
-+#define TYPE_POINTER_NAME \
-+ ((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION ".type_pointer_capsule" SWIG_TYPE_TABLE_NAME)
-+#endif
-
- /* Runtime API implementation */
-
-@@ -1356,8 +1366,12 @@ SWIG_Python_GetModule(void) {
- #ifdef SWIG_LINK_RUNTIME
- type_pointer = SWIG_ReturnGlobalTypeList((void *)0);
- #else
-+#ifdef USE_CAPSULES
-+ type_pointer = PyCapsule_Import(TYPE_POINTER_NAME, 0);
-+#else
- type_pointer = PyCObject_Import((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
- (char*)"type_pointer" SWIG_TYPE_TABLE_NAME);
-+#endif
- if (PyErr_Occurred()) {
- PyErr_Clear();
- type_pointer = (void *)0;
-@@ -1402,9 +1416,14 @@ PyModule_AddObject(PyObject *m, char *na
- SWIGRUNTIME void
- SWIG_Python_DestroyModule(void *vptr)
- {
-+ size_t i;
-+#ifdef USE_CAPSULES
-+ swig_module_info *swig_module =
-+ (swig_module_info *) PyCapsule_GetPointer((PyObject *)vptr, TYPE_POINTER_NAME);
-+#else
- swig_module_info *swig_module = (swig_module_info *) vptr;
-+#endif
- swig_type_info **types = swig_module->types;
-- size_t i;
- for (i =0; i < swig_module->size; ++i) {
- swig_type_info *ty = types[i];
- if (ty->owndata) {
-@@ -1426,9 +1445,18 @@ SWIG_Python_SetModule(swig_module_info *
- PyObject *module = Py_InitModule((char*)"swig_runtime_data" SWIG_RUNTIME_VERSION,
- swig_empty_runtime_method_table);
- #endif
-+#ifdef USE_CAPSULES
-+ PyObject *pointer = PyCapsule_New((void *)swig_module, TYPE_POINTER_NAME,
-+ (PyCapsule_Destructor)SWIG_Python_DestroyModule);
-+#else
- PyObject *pointer = PyCObject_FromVoidPtr((void *) swig_module, SWIG_Python_DestroyModule);
-+#endif
- if (pointer && module) {
-+#ifdef USE_CAPSULES
-+ PyModule_AddObject(module, (char*)"type_pointer_capsule" SWIG_TYPE_TABLE_NAME, pointer);
-+#else
- PyModule_AddObject(module, (char*)"type_pointer" SWIG_TYPE_TABLE_NAME, pointer);
-+#endif
- } else {
- Py_XDECREF(pointer);
- }
-@@ -1449,12 +1477,20 @@ SWIG_Python_TypeQuery(const char *type)
- PyObject *obj = PyDict_GetItem(cache, key);
- swig_type_info *descriptor;
- if (obj) {
-+#ifdef USE_CAPSULES
-+ descriptor = (swig_type_info *) PyCapsule_GetPointer(obj, type);
-+#else
- descriptor = (swig_type_info *) PyCObject_AsVoidPtr(obj);
-+#endif
- } else {
- swig_module_info *swig_module = SWIG_Python_GetModule();
- descriptor = SWIG_TypeQueryModule(swig_module, swig_module, type);
- if (descriptor) {
-+#ifdef USE_CAPSULES
-+ obj = PyCapsule_New(descriptor, type, NULL);
-+#else
- obj = PyCObject_FromVoidPtr(descriptor, NULL);
-+#endif
- PyDict_SetItem(cache, key, obj);
- Py_DECREF(obj);
- }
diff --git a/extra/swig/swig-pyslice.patch b/extra/swig/swig-pyslice.patch
deleted file mode 100644
index a6dd852ec..000000000
--- a/extra/swig/swig-pyslice.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Naur swig-2.0.3.ori/Lib/python/pycontainer.swg swig-2.0.3/Lib/python/pycontainer.swg
---- swig-2.0.3.ori/Lib/python/pycontainer.swg 2010-10-18 23:31:31.000000000 -0700
-+++ swig-2.0.3/Lib/python/pycontainer.swg 2011-04-08 08:50:37.281941342 -0700
-@@ -630,6 +630,7 @@
- return x;
- }
-
-+#if !NO_PYSLICE
- /* typemap for slice object support */
- %typemap(in) PySliceObject* {
- $1 = (PySliceObject *) $input;
-@@ -637,6 +638,7 @@
- %typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER) PySliceObject* {
- $1 = PySlice_Check($input);
- }
-+#endif
-
- Sequence* __getslice__(difference_type i, difference_type j) throw (std::out_of_range) {
- return swig::getslice(self, i, j);
-@@ -659,7 +661,11 @@
- /* Overloaded methods for Python 3 compatibility
- * (Also useful in Python 2.x)
- */
-+#if NO_PYSLICE
-+ Sequence* __getitem__(PyObject *slice) throw (std::out_of_range) {
-+#else
- Sequence* __getitem__(PySliceObject *slice) throw (std::out_of_range) {
-+#endif
- Py_ssize_t i, j, step;
- if( !PySlice_Check(slice) ) {
- SWIG_Error(SWIG_TypeError, "Slice object expected.");
-@@ -669,7 +675,11 @@
- return swig::getslice(self, i, j);
- }
-
-+#if NO_PYSLICE
-+ void __setitem__(PyObject *slice, const Sequence& v)
-+#else
- void __setitem__(PySliceObject *slice, const Sequence& v)
-+#endif
- throw (std::out_of_range, std::invalid_argument) {
- Py_ssize_t i, j, step;
- if( !PySlice_Check(slice) ) {
-@@ -680,7 +690,11 @@
- swig::setslice(self, i, j, v);
- }
-
-+#if NO_PYSLICE
-+ void __delitem__(PyObject *slice)
-+#else
- void __delitem__(PySliceObject *slice)
-+#endif
- throw (std::out_of_range) {
- Py_ssize_t i, j, step;
- if( !PySlice_Check(slice) ) {
-diff -Naur swig-2.0.3.ori/Source/Modules/python.cxx swig-2.0.3/Source/Modules/python.cxx
---- swig-2.0.3.ori/Source/Modules/python.cxx 2011-03-14 00:22:08.000000000 -0700
-+++ swig-2.0.3/Source/Modules/python.cxx 2011-04-08 08:53:39.288607977 -0700
-@@ -437,6 +437,7 @@
-
- if (py3) {
- /* force disable features that not compatible with Python 3.x */
-+ Preprocessor_define((DOH *) "NO_PYSLICE 1", 0);
- classic = 0;
- }
-
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-27 10:55:48 +0000