[packages/openshot] - and delete obsolete patches
arekm
arekm at pld-linux.org
Wed Nov 30 15:01:32 CET 2016
commit 20fe2d266782cc599bb13aea7dfb376e598172f6
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Nov 30 15:01:27 2016 +0100
- and delete obsolete patches
openshot-bug-722285.patch | 141 ----------------------------------------------
openshot-crf.patch | 10 ----
openshot-locale_dir.patch | 12 ----
openshot-r741.patch | 43 --------------
4 files changed, 206 deletions(-)
---
diff --git a/openshot-bug-722285.patch b/openshot-bug-722285.patch
deleted file mode 100644
index 04b74df..0000000
--- a/openshot-bug-722285.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-diff -x '*.pyc' -x '*.py~' -x '*.ui~' -urBN openshot-1.4.3//openshot/classes/sequences.py openshot-1.4.3-patched//openshot/classes/sequences.py
---- openshot-1.4.3//openshot/classes/sequences.py 2012-09-30 22:33:29.000000000 +0200
-+++ openshot-1.4.3-patched//openshot/classes/sequences.py 2013-05-21 21:56:14.000000000 +0200
-@@ -302,10 +302,7 @@
-
- # resize the canvas height and width
- new_size_of_middle = Size_Of_Middle + 200
-- if new_size_of_middle > 32000:
-- # do not let the size of the canvas exceed 32,000... or cairo will throw an error
-- new_size_of_middle = 32000
--
-+
- canvas_timeline.set_bounds (0, 0, new_size_of_middle, timeline_heigth)
- self.project.form.hscrollbar2.set_range(0, new_size_of_middle)
- self.project.form.vscrollbar2.set_range(0, timeline_heigth)
-@@ -381,9 +378,7 @@
- # loop through each tick mark
- number_of_ticks = int(self.length / self.scale)
- ruler_pixels = ((float(self.length) / float(self.scale)) * self.tick_pixels)
-- if ruler_pixels > 32000:
-- ruler_pixels = 32000
--
-+
- tick = 0
- end_of_timeline = False
-
-diff -x '*.pyc' -x '*.py~' -x '*.ui~' -urBN openshot-1.4.3//openshot/widgets/catalog.xml openshot-1.4.3-patched//openshot/widgets/catalog.xml
---- openshot-1.4.3//openshot/widgets/catalog.xml 1970-01-01 01:00:00.000000000 +0100
-+++ openshot-1.4.3-patched//openshot/widgets/catalog.xml 2012-05-27 22:55:15.000000000 +0200
-@@ -0,0 +1,11 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<glade-catalog name="openshotwidgets" library="gladepython" domain="glade-3" depends="gtk+" language="python">
-+ <init-function>glade_python_init</init-function>
-+ <glade-widget-classes>
-+ <glade-widget-class title="Extended Scrollbar" name="Extended_Scrollbar" generic-name="Extended_Scrollbar"></glade-widget-class>
-+ </glade-widget-classes>
-+ <glade-widget-group name="OpenShot-widgets" title="OpenShot Widgets">
-+ <glade-widget-class-ref name="Extended_Scrollbar"/>
-+ </glade-widget-group>
-+</glade-catalog>
-+
-diff -x '*.pyc' -x '*.py~' -x '*.ui~' -urBN openshot-1.4.3//openshot/widgets/__init__.py openshot-1.4.3-patched//openshot/widgets/__init__.py
---- openshot-1.4.3//openshot/widgets/__init__.py 1970-01-01 01:00:00.000000000 +0100
-+++ openshot-1.4.3-patched//openshot/widgets/__init__.py 2013-05-21 22:38:02.000000000 +0200
-@@ -0,0 +1 @@
-+#Comment so diff will include the file in the patch
-\ Kein Zeilenumbruch am Dateiende.
-diff -x '*.pyc' -x '*.py~' -x '*.ui~' -urBN openshot-1.4.3//openshot/widgets/openshotwidgets.py openshot-1.4.3-patched//openshot/widgets/openshotwidgets.py
---- openshot-1.4.3//openshot/widgets/openshotwidgets.py 1970-01-01 01:00:00.000000000 +0100
-+++ openshot-1.4.3-patched//openshot/widgets/openshotwidgets.py 2013-05-22 22:55:24.000000000 +0200
-@@ -0,0 +1,40 @@
-+import gtk
-+
-+class Extended_Scrollbar(gtk.HScrollbar):
-+ __gtype_name__ = 'Extended_Scrollbar'
-+
-+ def __init__(self):
-+ self.adjustedadjustment=gtk.Adjustment(0.0, 0.0, 101.0, 0.1, 1.0, 1.0)
-+ self.scalefactor=1.0
-+ self.offset=0
-+ super(Extended_Scrollbar,self).__init__(self.adjustedadjustment)
-+
-+ def get_value(self):
-+ return (super(Extended_Scrollbar,self).get_value()-self.offset)/self.scalefactor
-+
-+ def set_value(self,goto_pixel):
-+ super(Extended_Scrollbar,self).set_value(goto_pixel*self.scalefactor+self.offset)
-+
-+ def set_range(self,gminimum,gmaximum):
-+ maxrange=64000
-+ if gmaximum<gminimum:
-+ swap=gmaximum
-+ gmaximum=gminimum
-+ gminimum=swap
-+
-+ if gmaximum-gminimum>maxrange or gmaximum>32000 or gminimum<32000:
-+ self.scalefactor=float(maxrange)/float(gmaximum-gminimum)
-+ gmaximum=32000
-+ gminimum=-32000
-+ self.offset=-32000
-+ else:
-+ self.scalefactor=1.0
-+ self.offset=0
-+ super(Extended_Scrollbar,self).set_range(gminimum,gmaximum)
-+
-+
-+ def get_adjustment(self):
-+ return super(Extended_Scrollbar,self).get_adjustment()
-+
-+ def set_adjustment_page_size(self,pagesize):
-+ super(Extended_Scrollbar,self).get_adjustment().set_page_size(pagesize)
-\ Kein Zeilenumbruch am Dateiende.
-diff -x '*.pyc' -x '*.py~' -x '*.ui~' -urBN openshot-1.4.3//openshot/windows/MainGTK.py openshot-1.4.3-patched//openshot/windows/MainGTK.py
---- openshot-1.4.3//openshot/windows/MainGTK.py 2012-09-30 22:33:29.000000000 +0200
-+++ openshot-1.4.3-patched//openshot/windows/MainGTK.py 2013-05-22 22:54:13.000000000 +0200
-@@ -28,6 +28,7 @@
- import webbrowser
- import subprocess
- import shutil
-+from widgets import openshotwidgets
-
- import classes.effect as effect
- from classes import files, lock, messagebox, open_project, project, timeline, tree, video, inputbox, av_formats, clip
-@@ -2450,7 +2451,7 @@
-
- # get the middle of the window
- screen_width = (self.width / 2) - 100
--
-+
- if playhead_pixels > (current_scroll_pixels + screen_width):
- # scroll to last scroll position
- self.hscrollbar2.set_value(playhead_pixels - screen_width)
-diff -x '*.pyc' -x '*.py~' -x '*.ui~' -urBN openshot-1.4.3//openshot/windows/ui/Main.ui openshot-1.4.3-patched//openshot/windows/ui/Main.ui
---- openshot-1.4.3//openshot/windows/ui/Main.ui 2012-09-30 22:33:29.000000000 +0200
-+++ openshot-1.4.3-patched//openshot/windows/ui/Main.ui 2013-05-22 22:49:28.000000000 +0200
-@@ -1694,11 +1694,11 @@
- </packing>
- </child>
- <child>
-- <object class="GtkHScrollbar" id="hscrollbar2">
-+ <object class="Extended_Scrollbar" id="hscrollbar2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="adjustment">adjustment1</property>
-- <signal name="value-changed" handler="on_hscrollbar2_value_changed" swapped="no"/>
-+ <signal name="value-changed" handler="on_hscrollbar2_value_changed"/>
- </object>
- <packing>
- <property name="expand">True</property>
-diff -urN openshot-1.4.3.org/setup.py openshot-1.4.3/setup.py
---- openshot-1.4.3.org/setup.py 2012-09-30 22:33:29.000000000 +0200
-+++ openshot-1.4.3/setup.py 2013-09-22 21:56:32.862122011 +0200
-@@ -57,7 +57,7 @@
- # -------------------------------------
- dist = setup(
- scripts = ['bin/openshot','bin/openshot-render'],
-- packages = ['openshot', 'openshot.classes', 'openshot.language', 'openshot.windows', 'openshot.uploads', 'openshot.uploads.vimeo', 'openshot.uploads.vimeo.httplib2', 'openshot.uploads.vimeo.httplib2wrap', 'openshot.uploads.vimeo.oauth2', 'openshot.uploads.vimeo.oauth2.clients', 'openshot.uploads.youtube', 'openshot.uploads.youtube.atom', 'openshot.uploads.youtube.gdata', 'openshot.uploads.youtube.gdata.geo', 'openshot.uploads.youtube.gdata.media', 'openshot.uploads.youtube.gdata.oauth', 'openshot.uploads.youtube.gdata.opensearch', 'openshot.uploads.youtube.gdata.tlslite', 'openshot.uploads.youtube.gdata.tlslite.integration', 'openshot.uploads.youtube.gdata.tlslite.utils', 'openshot.uploads.youtube.gdata.youtube'],
-+ packages = ['openshot', 'openshot.classes', 'openshot.language', 'openshot.widgets', 'openshot.windows', 'openshot.uploads', 'openshot.uploads.vimeo', 'openshot.uploads.vimeo.httplib2', 'openshot.uploads.vimeo.httplib2wrap', 'openshot.uploads.vimeo.oauth2', 'openshot.uploads.vimeo.oauth2.clients', 'openshot.uploads.youtube', 'openshot.uploads.youtube.atom', 'openshot.uploads.youtube.gdata', 'openshot.uploads.youtube.gdata.geo', 'openshot.uploads.youtube.gdata.media', 'openshot.uploads.youtube.gdata.oauth', 'openshot.uploads.youtube.gdata.opensearch', 'openshot.uploads.youtube.gdata.tlslite', 'openshot.uploads.youtube.gdata.tlslite.integration', 'openshot.uploads.youtube.gdata.tlslite.utils', 'openshot.uploads.youtube.gdata.youtube'],
- package_data = {
- 'openshot' : ['export_presets/*', 'images/*', 'locale/OpenShot/*', 'locale/README', 'profiles/*', 'themes/*/*.png', 'themes/*/*.xml', 'themes/*/icons/*.png', 'titles/*/*.svg', 'transitions/icons/medium/*.png', 'transitions/icons/small/*.png', 'transitions/*.pgm', 'transitions/*.png', 'transitions/*.svg', 'effects/icons/medium/*.png', 'effects/icons/small/*.png', 'effects/*.xml', 'blender/blend/*.blend', 'blender/icons/*.png', 'blender/earth/*.jpg', 'blender/scripts/*.py', 'blender/*.xml'] + locale_files,
- 'openshot.windows' : ['ui/*.ui', 'ui/icons/*'],
diff --git a/openshot-crf.patch b/openshot-crf.patch
deleted file mode 100644
index 27498b1..0000000
--- a/openshot-crf.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- openshot-1.4.3/openshot/classes/video.py~ 2012-09-30 22:33:29.000000000 +0200
-+++ openshot-1.4.3/openshot/classes/video.py 2014-09-01 08:43:10.601932534 +0200
-@@ -154,6 +154,7 @@
- self.c.set("subcmp", "2")
- self.c.set("cmp", "2")
- self.c.set("coder", "1")
-+ self.c.set("crf", "18")
- self.c.set("flags", "+loop")
- self.c.set("flags2", "dct8x8")
- self.c.set("qmax", "51")
diff --git a/openshot-locale_dir.patch b/openshot-locale_dir.patch
deleted file mode 100644
index 2bb5d6a..0000000
--- a/openshot-locale_dir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -dur openshot-1.1.0.orig/openshot/classes/project.py openshot-1.1.0/openshot/classes/project.py
---- openshot-1.1.0.orig/openshot/classes/project.py 2010-03-01 06:39:41.000000000 +0100
-+++ openshot-1.1.0/openshot/classes/project.py 2010-03-13 16:53:34.000000000 +0100
-@@ -44,7 +44,7 @@
- self.BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
- self.GLADE_DIR = os.path.join(self.BASE_DIR, "openshot", "windows", "glade")
- self.IMAGE_DIR = os.path.join(self.BASE_DIR, "openshot", "images")
-- self.LOCALE_DIR = os.path.join(self.BASE_DIR, "openshot", "locale")
-+ self.LOCALE_DIR = os.path.join("/usr/share/locale")
- self.PROFILES_DIR = os.path.join(self.BASE_DIR, "openshot", "profiles")
- self.TRANSITIONS_DIR = os.path.join(self.BASE_DIR, "openshot", "transitions")
- self.EXPORT_PRESETS_DIR = os.path.join(self.BASE_DIR, "openshot", "export_presets")
diff --git a/openshot-r741.patch b/openshot-r741.patch
deleted file mode 100644
index 7073611..0000000
--- a/openshot-r741.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-=== modified file 'openshot/classes/sequences.py'
---- openshot/classes/sequences.py 2012-09-07 20:37:38 +0000
-+++ openshot/classes/sequences.py 2013-08-20 20:42:30 +0000
-@@ -152,6 +152,12 @@
-
- def Render(self):
-
-+ # Disable window redraws temporarily (prevents flicker)
-+ self.project.form.MyCanvas_Left.window.freeze_updates()
-+ self.project.form.TimelineCanvas_Left.window.freeze_updates()
-+ self.project.form.MyCanvas.window.freeze_updates()
-+ self.project.form.TimelineCanvas_Right.window.freeze_updates()
-+
- # Clear the canvases
- self.project.form.MyCanvas_Left.set_root_item(goocanvas.Group())
- self.project.form.TimelineCanvas_Left.set_root_item(goocanvas.Group())
-@@ -180,7 +186,11 @@
- # Render track
- MyTran.Render()
-
--
-+ # Enable window redraws again
-+ self.project.form.MyCanvas_Left.window.thaw_updates()
-+ self.project.form.TimelineCanvas_Left.window.thaw_updates()
-+ self.project.form.MyCanvas.window.thaw_updates()
-+ self.project.form.TimelineCanvas_Right.window.thaw_updates()
-
- def GenerateXML(self, dom, xmlParentNode):
-
-
-=== modified file 'openshot/windows/ui/Main.ui'
---- openshot/windows/ui/Main.ui 2012-04-29 21:18:25 +0000
-+++ openshot/windows/ui/Main.ui 2013-08-20 20:42:30 +0000
-@@ -1514,7 +1514,7 @@
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="tooltip_text" translatable="yes">Slide to Zoom</property>
-- <property name="update_policy">delayed</property>
-+ <property name="update_policy">continuous</property>
- <property name="adjustment">adjustment3</property>
- <property name="draw_value">False</property>
- <signal name="change-value" handler="on_hsZoom_change_value" swapped="no"/>
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openshot.git/commitdiff/20fe2d266782cc599bb13aea7dfb376e598172f6
More information about the pld-cvs-commit
mailing list