Attachment 165060 Details for Bug 205864 – single file diff for it all

[patch] single file diff for it all

x11_xpra.diff (text/plain), 6.82 KB, created by Zane C. Bowers-Hadley on 2016-01-04 15:06:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Zane C. Bowers-Hadley

Created: 2016-01-04 15:06:39 UTC

Size: 6.82 KB

patch

obsolete

>diff -run xpra.orig/Makefile xpra/Makefile
>d5 1
>a5 1
>PORTVERSION=	0.16.0
>d71 1
>a71 1
>XPRA_OPTIONS_DISABLED+=	nvenc4 nvenc5
>diff -run xpra.orig/distinfo xpra/distinfo
>d1 2
>a2 2
>SHA256 (xpra-0.16.0.tar.xz) = 69ab3d14ffbd4aa34f9d7cda237a8e72183ac395c23252d3882f889a20cc189f
>SIZE (xpra-0.16.0.tar.xz) = 1338996
>diff -run xpra.orig/files/patch-setup.py xpra/files/patch-setup.py
>d1 6
>a6 6
>--- setup.py.orig	2016-01-04 00:37:34.614316000 -0600
>+++ setup.py	2016-01-04 00:40:04.738235000 -0600
>@@ -165,7 +165,7 @@
>     nvenc4_ENABLED          = pkg_config_ok("--exists", "nvenc4")
>     nvenc5_ENABLED          = pkg_config_ok("--exists", "nvenc5")
> 
>d9 1
>a9 1
> memoryview_ENABLED      = sys.version>='2.7'
>d11 2
>a12 2
> annotate_ENABLED        = True
>@@ -1649,12 +1649,12 @@
>d17 1
>a17 1
>+    add_data_files("man/man1",      ["man/xpra.1", "man/xpra_launcher.1"])
>d23 1
>a23 1
>+    add_data_files("share/pixmaps",         ["xdg/xpra.png"])
>d27 1
>a27 1
>@@ -1781,7 +1781,7 @@
>d35 1
>a35 1
> if annotate_ENABLED:
>Only in xpra.orig/files: patch-xpra_codecs_buffers_memalign.c
>Only in xpra.orig/files: patch-xpra_net_net__util.py
>diff -run xpra.orig/pkg-plist xpra/pkg-plist
>d75 3
>d90 3
>d228 3
>d248 3
>d481 6
>a486 3
>%%PYTHON_SITELIBDIR%%/xpra/server/control_command.py
>%%PYTHON_SITELIBDIR%%/xpra/server/control_command.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/control_command.pyo
>d488 3
>a490 9
>%%PYTHON_SITELIBDIR%%/xpra/server/dbus/__init__.py
>%%PYTHON_SITELIBDIR%%/xpra/server/dbus/__init__.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/dbus/__init__.pyo
>%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_server.py
>%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_server.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_server.pyo
>%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_source.py
>%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_source.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/dbus/dbus_source.pyo
>d500 10
>a509 9
>%%PYTHON_SITELIBDIR%%/xpra/server/proxy/__init__.py
>%%PYTHON_SITELIBDIR%%/xpra/server/proxy/__init__.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/proxy/__init__.pyo
>%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_instance_process.py
>%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_instance_process.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_instance_process.pyo
>%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_server.py
>%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_server.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/proxy/proxy_server.pyo
>d519 3
>a521 15
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/__init__.py
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/__init__.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/__init__.pyo
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/gtk_root_window_model.py
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/gtk_root_window_model.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/gtk_root_window_model.pyo
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/root_window_model.py
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/root_window_model.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/root_window_model.pyo
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_dbus_server.py
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_dbus_server.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_dbus_server.pyo
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_server_base.py
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_server_base.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/shadow/shadow_server_base.pyo
>d528 12
>a539 22
>%%PYTHON_SITELIBDIR%%/xpra/server/window/__init__.py
>%%PYTHON_SITELIBDIR%%/xpra/server/window/__init__.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/window/__init__.pyo
>%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_config.py
>%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_config.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_config.pyo
>%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_delay_calculator.py
>%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_delay_calculator.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/window/batch_delay_calculator.pyo
>%%PYTHON_SITELIBDIR%%/xpra/server/window/region.so
>%%PYTHON_SITELIBDIR%%/xpra/server/window/video_subregion.py
>%%PYTHON_SITELIBDIR%%/xpra/server/window/video_subregion.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/window/video_subregion.pyo
>%%PYTHON_SITELIBDIR%%/xpra/server/window/window_source.py
>%%PYTHON_SITELIBDIR%%/xpra/server/window/window_source.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/window/window_source.pyo
>%%PYTHON_SITELIBDIR%%/xpra/server/window/window_stats.py
>%%PYTHON_SITELIBDIR%%/xpra/server/window/window_stats.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/window/window_stats.pyo
>%%PYTHON_SITELIBDIR%%/xpra/server/window/window_video_source.py
>%%PYTHON_SITELIBDIR%%/xpra/server/window/window_video_source.pyc
>%%PYTHON_SITELIBDIR%%/xpra/server/window/window_video_source.pyo
>d587 9
>a595 44
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/__init__.py
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/__init__.pyc
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/__init__.pyo
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/composite.py
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/composite.pyc
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/composite.pyo
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/gdk_bindings.so
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/gdk_display_source.so
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/__init__.py
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/__init__.pyc
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/__init__.pyo
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/base.py
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/base.pyc
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/base.pyo
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/core.py
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/core.pyc
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/core.pyo
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/or_window.py
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/or_window.pyc
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/or_window.pyo
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/size_hints_util.py
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/size_hints_util.pyc
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/size_hints_util.pyo
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/systray.py
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/systray.pyc
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/systray.pyo
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/window.py
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/window.pyc
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/models/window.pyo
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/selection.py
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/selection.pyc
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/selection.pyo
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/tray.py
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/tray.pyc
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/tray.pyo
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/window.py
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/window.pyc
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/window.pyo
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/wm.py
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/wm.pyc
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/wm.pyo
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/world_window.py
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/world_window.pyc
>%%PYTHON_SITELIBDIR%%/xpra/x11/gtk2/world_window.pyo
>d599 5
>d610 3
>d616 12

Actions: View | Diff

Attachments on bug 205864: 165037 | 165060 | 169605 | 179381 | 179707 | 179867