diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-21 04:12:07 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-21 04:12:07 +0200 |
| commit | 17f3e3bc5157eeb6018ddaa6d862ca94f4b02b2b (patch) | |
| tree | 38cc2874f114bc6a564c9aa518196da93b1f67dc /debian | |
| parent | 9013a24da1830b445c03ba273e80774fd1d68fd7 (diff) | |
| parent | 4c8fc6be8f530d3bc84d1097bd2cb6a4af6c77fc (diff) | |
| download | nx-libs-17f3e3bc5157eeb6018ddaa6d862ca94f4b02b2b.tar.gz nx-libs-17f3e3bc5157eeb6018ddaa6d862ca94f4b02b2b.tar.bz2 nx-libs-17f3e3bc5157eeb6018ddaa6d862ca94f4b02b2b.zip | |
Merge branch 'sunweaver-pr/xrandr-extension-upgrade-1.5' into 3.6.x
Attributes GH PR #137: https://github.com/ArcticaProject/nx-libs/pull/137
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Mon, 20 Jun 2016 12:40:52 -0700
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches-pending-evaluation/fix-icon-and-clipboard.patch | 2 | ||||
| -rw-r--r-- | debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/debian/control b/debian/control index 3e1f45e5d..d7e6f9a2c 100644 --- a/debian/control +++ b/debian/control @@ -28,7 +28,7 @@ Build-Depends: pkg-config, x11proto-core-dev, expat, - libpixman-1-dev, + libpixman-1-dev (>= 0.13.2), Standards-Version: 3.9.6 Homepage: http://code.x2go.org/gitweb?p=nx-libs.git;a=summary Vcs-Git: git://code.x2go.org/nx-libs.git diff --git a/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch b/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch index e4faef051..d6ecf8f19 100644 --- a/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch +++ b/debian/patches-pending-evaluation/fix-icon-and-clipboard.patch @@ -323,7 +323,7 @@ index 862f75a..5405568 100644 x.u.u.type = SelectionRequest; x.u.selectionRequest.time = GetTimeInMillis(); x.u.selectionRequest.owner = lastOwnerWindow; - x.u.selectionRequest.requestor = WindowTable[0]->drawable.id; + x.u.selectionRequest.requestor = screenInfo.screens[0]->root->drawable.id; - x.u.selectionRequest.selection = XA_PRIMARY; +/* My changes */ +/* diff --git a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch index 0d11f2f0a..cc95c8153 100644 --- a/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch +++ b/debian/patches/102_xserver-xext_set-securitypolicy-path.debian.patch @@ -8,7 +8,7 @@ Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Last-Update: 2012-01-12 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c -@@ -86,7 +86,7 @@ +@@ -78,7 +78,7 @@ #ifdef NXAGENT_SERVER |