aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'uli42-pr/update_os' into 3.6.xMihai Moldovan2018-02-274-9/+7
|\ | | | | | | Attributes GH PR #651: https://github.com/ArcticaProject/nx-libs/pull/651
| * Lift os to XORG-7_1 state - non-functional changes onlyUlrich Sibiller2018-02-271-0/+1
| |
| * Lift os to XORG-7_1 stateUlrich Sibiller2018-02-273-9/+6
|/
* Remove unused X11R4 DDX compatibility function miClipNotify.Mihai Moldovan2018-02-272-84/+0
| | | | | | | | | | | | Backported from X.org: commit 39ce5f1544029412f4060f3e89ce1d87222ef42b Author: Adam Jackson <ajax@nwnk.net> Date: Fri Jan 6 17:05:26 2006 +0000 Remove unused X11R4 DDX compatibility function miClipNotify. Backported-to-NX-by: Mihai Moldovan <ionic@ionic.de>
* Merge branch 'uli42-pr/update_mi' into 3.6.xMihai Moldovan2018-02-2711-75/+45
|\ | | | | | | Attributes GH PR #650: https://github.com/ArcticaProject/nx-libs/pull/650
| * Lift mi to xorg-xserver-7.1/1.1.0 state - non-functional changes onlyUlrich Sibiller2018-02-272-2/+2
| |
| * Lift mi to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-278-72/+41
| | | | | | | | I left out glx changes to miinitext.c for now.
| * Lift miext to xorg-xserver-7.1/1.1.10 stateUlrich Sibiller2018-02-272-1/+2
|/
* Merge branch 'uli42-pr/update_record' into 3.6.xMihai Moldovan2018-02-272-403/+76
|\ | | | | | | Attributes GH PR #649: https://github.com/ArcticaProject/nx-libs/pull/649
| * Lift record to xorg-server-1.4.2 stateUlrich Sibiller2018-02-271-4/+4
| |
| * Lift record to xorg-server-1.2.0/xorg-server-1.3.0.0 state - non-functional ↵Ulrich Sibiller2018-02-271-53/+22
| | | | | | | | changes only
| * Lift record to xorg-server-1.2.0/xorg-server-1.3.0.0 stateUlrich Sibiller2018-02-271-222/+0
| |
| * Lift record to xorg-xserver-7.1/1.1.0 state - non-functional changes onlyUlrich Sibiller2018-02-271-115/+43
| |
| * Lift record to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-271-9/+7
|/
* Merge branch 'sunweaver-pr/version-cmdline-option' into 3.6.xMihai Moldovan2018-02-2731-103/+124
|\ | | | | | | | | | | | | Attributes GH PR #660: https://github.com/ArcticaProject/nx-libs/pull/660 Fixes: ArcticaProject/nx-libs#653 Fixes: ArcticaProject/nx-libs#639
| * hw/nxagent/: Stop using non-portable '__progname', set up our own ↵Mike Gabriel2018-02-263-7/+9
| | | | | | | | 'nxagentProgName' instead and pass it around where needed.
| * hw/nxagent/: Use <function>(void) rather than <function>().Mike Gabriel2018-02-2628-94/+94
| |
| * nxagent/Args.c: Mention new -options cmdline parameter in usage info.Simon Matter2018-02-261-0/+1
| | | | | | | | Fixes ArcticaProject/nx-libs#639
| * nxagent: Print correct application in usage message.Simon Matter2018-02-261-0/+5
| | | | | | | | Fixes ArcticaProject/nx-libs#639.
| * nxagent: Add -version cmdline option.Simon Matter2018-02-264-4/+17
|/ | | | Fixes ArcticaProject/nx-libs#653.
* nx-libs.spec: also package extensions/shapeconst.h in RPM packages.Mihai Moldovan2018-02-261-0/+1
|
* Merge branch 'uli42-pr/update_dbe' into 3.6.xMihai Moldovan2018-02-265-141/+72
|\ | | | | | | Attribiutes GH PR #647: https://github.com/ArcticaProject/nx-libs/pull/647
| * dbe: add NXAGENT_SERVER guard for DixLookupUlrich Sibiller2018-02-262-0/+32
| |
| * Lift dbe to xorg-xserver-1.4.2 state - non-functional changes onlyUlrich Sibiller2018-02-262-9/+0
| |
| * Lift dbe to xorg-xserver-1.4.2 stateUlrich Sibiller2018-02-263-50/+4
| |
| * Lift dbe to xorg-xserver-7.1/1.1.0 state - non-functional changes onlyUlrich Sibiller2018-02-262-86/+34
| |
| * Lift dbe to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-262-3/+9
|/
* debian/nx-x11proto-xext-dev.install: install new file extensions/shapeconst.h.Mihai Moldovan2018-02-261-0/+1
|
* Merge branch 'uli42-pr/update_dix' into 3.6.xMihai Moldovan2018-02-2626-131/+328
|\ | | | | | | Attributes GH PR #646: https://github.com/ArcticaProject/nx-libs/pull/646
| * Transfer previous dix changes into hw/nxagentUlrich Sibiller2018-02-261-21/+31
| |
| * Lift dix to xorg-xserver-1.3.0.0 state - non-functional changes onlyUlrich Sibiller2018-02-264-10/+5
| |
| * Lift dix to xorg-xserver-1.3.0.0 stateUlrich Sibiller2018-02-2618-85/+184
| |
| * Lift dix to xorg-xserver-7.1/1.1.0 state - non-functional changes onlyUlrich Sibiller2018-02-263-1/+24
| |
| * Lift dix to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-269-14/+84
|/
* Merge branch 'uli42-pr/update_xfixes' into 3.6.xMihai Moldovan2018-02-2612-32/+572
|\ | | | | | | Attributes GH PR #645: https://github.com/ArcticaProject/nx-libs/pull/645
| * Lift XFIXES to xorg-xserver-1.4.2 state - non-functional changes onlyUlrich Sibiller2018-02-267-15/+1
| |
| * Lift XFIXES to xorg-xserver-1.4.2 stateUlrich Sibiller2018-02-266-6/+46
| |
| * Lift XFIXES to xorg-xserver-7.1/1.1.0 state (XFIXES 4.0) - non-functional ↵Ulrich Sibiller2018-02-269-12/+114
| | | | | | | | changes only
| * Lift XFIXES to xorg-xserver-7.1/1.1.0 state (XFIXES 4.0)Ulrich Sibiller2018-02-268-9/+421
|/
* Merge branch 'sunweaver-pr/nomagicpixel' into 3.6.xMihai Moldovan2018-02-268-2/+38
|\ | | | | | | | | | | Attributes GH PR #658: https://github.com/ArcticaProject/nx-libs/pull/658 Fixes: ArcticaProject/nx-libs#657
| * nxagent: Add support for optionally enabling/disabling the magic pixel feature.Mike Gabriel2018-02-268-2/+38
|/ | | | Fixes ArcticaProject/nx-libs#657.
* Merge branch 'uli42-pr/update_xi' into arctica-3.6.xMihai Moldovan2018-02-2674-4095/+3146
|\ | | | | | | Attributes GH PR #644: https://github.com/ArcticaProject/nx-libs/pull/644
| * Xi: change () prototypes to (void)Ulrich Sibiller2018-02-262-5/+5
| | | | | | | | | | | | | | | | According to the C standard these are not equivalent. However, the same change has been done in Xorg upstream. Plus these functions are not called with parameters anywhere so we should be fine. Besides, include/{extinit.h,XIstubs.h} always had the "void".
| * Xi/getbmap.c: remove unnecessary castUlrich Sibiller2018-02-261-1/+1
| | | | | | | | Was forgotten in f6a1bda2dff0c70aa13f3cb763a9b08c4c037c53
| * Xi: small formatting changes to match Xorg 7.1's XiUlrich Sibiller2018-02-2615-46/+48
| |
| * Xi: reformatUlrich Sibiller2018-02-2637-893/+534
| |
| * Xi: ansify function prototypesUlrich Sibiller2018-02-2673-942/+350
| |
| * Xi: reformat code, ansifyUlrich Sibiller2018-02-2674-2030/+2030
| |
| * Xi: Adapt include sections to match Xorg 7.1Ulrich Sibiller2018-02-2637-168/+168
|/
* debian/control: Don't B-D on build-essential packages.Mike Gabriel2018-02-251-2/+0
|