ChangeLog revision bfe6082c
1bfe6082cSmrgcommit f8b240e897ed68b90c116ce4c2f8814e71e5aa97 2bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 3bfe6082cSmrgDate: Wed Mar 17 15:39:53 2021 +1000 4bfe6082cSmrg 5bfe6082cSmrg xkbcomp 1.4.5 6bfe6082cSmrg 7bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 8bfe6082cSmrg 9bfe6082cSmrgcommit da810f10d732a312ccee88652141c1d165efc114 10bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 11bfe6082cSmrgDate: Thu Jan 21 13:24:00 2021 +1000 12bfe6082cSmrg 13bfe6082cSmrg keycodes: compress the high keycode warning 14bfe6082cSmrg 15bfe6082cSmrg No point spending 3 lines on this, especially given that this warning is 16bfe6082cSmrg always triggered. 17bfe6082cSmrg 18bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 19bfe6082cSmrg 20bfe6082cSmrgcommit 80398db098b2a2214c5bef28d09cefd58beac43d 21bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 22bfe6082cSmrgDate: Thu Jan 21 13:20:40 2021 +1000 23bfe6082cSmrg 24bfe6082cSmrg keycodes: downgrade the >255 keycode warning to an info 25bfe6082cSmrg 26bfe6082cSmrg This warning will be triggered all the time now that xkeyboard-config has 27bfe6082cSmrg started adding keycodes > 255. Downgrade to an info, there's nothing the user 28bfe6082cSmrg can do about this warning anyway. 29bfe6082cSmrg 30bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 31bfe6082cSmrg 32bfe6082cSmrgcommit 1955a2645670eeea83d6d163653749249cd839f2 33bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 34bfe6082cSmrgDate: Thu Jan 21 13:16:53 2021 +1000 35bfe6082cSmrg 36bfe6082cSmrg Downgrade the warning for missing symbols to info 37bfe6082cSmrg 38bfe6082cSmrg In the interest of maintainability, it's easier to include as many keycodes as 39bfe6082cSmrg possible and then have the symbols mapping specific to the layout. This is 40bfe6082cSmrg particularly true for evdev where the kernel takes care of device-specifics 41bfe6082cSmrg and every keyboard has the same set of keycodes anyway. 42bfe6082cSmrg 43bfe6082cSmrg So let's downgrade this from a warning to a mere info, virtually every 44bfe6082cSmrg keyboard right now triggers this warning for a number of keys. 45bfe6082cSmrg 46bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 47bfe6082cSmrg 48bfe6082cSmrgcommit 9510dedad875099c32993246188050ea73ab1a9f 49bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 50bfe6082cSmrgDate: Thu Jan 21 13:08:25 2021 +1000 51bfe6082cSmrg 52bfe6082cSmrg Replace WARN[1-9], ERROR[1-9], etc. with their unnumbered version 53bfe6082cSmrg 54bfe6082cSmrg Those macros date back to when varargs weren't a thing but they've 55bfe6082cSmrg been #defined to the same value for 17 years now. 56bfe6082cSmrg 57bfe6082cSmrg Patch generated with: 58bfe6082cSmrg for action in WARN INFO ERROR ACTION FATAL WSGO; do 59bfe6082cSmrg sed -i "s/${action}[1-9]/${action}/g" `git ls-files` 60bfe6082cSmrg done 61bfe6082cSmrg 62bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 63bfe6082cSmrg 64bfe6082cSmrgcommit ff6a19ed8898ee8c79b2b2a2f87806353d89f5d4 65bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 66bfe6082cSmrgDate: Thu Jan 21 13:46:01 2021 +1000 67bfe6082cSmrg 68bfe6082cSmrg gitlab CI: add basic build test 69bfe6082cSmrg 70bfe6082cSmrg Copied from xorgproto 71bfe6082cSmrg 72bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 73bfe6082cSmrg 74bfe6082cSmrgcommit 3b3d25dd32ba48fd6d15ca98baf7109af21e1d97 75bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 76bfe6082cSmrgDate: Thu Jan 21 13:24:51 2021 +1000 77bfe6082cSmrg 78bfe6082cSmrg Remove trailing whitespaces 79bfe6082cSmrg 80bfe6082cSmrg Let's clean this up so I don't have to fight vim and git in removing them. 81bfe6082cSmrg 82bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 83bfe6082cSmrg 84bfe6082cSmrgcommit 790b998647ec171133bf196a3d84c5153cd64840 85bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 86bfe6082cSmrgDate: Thu Nov 5 14:24:24 2020 +1000 87bfe6082cSmrg 88bfe6082cSmrg xkbcomp 1.4.4 89bfe6082cSmrg 90bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 91bfe6082cSmrg 92bfe6082cSmrgcommit a0a4f112c5858ac2b932247dba2d85061bb59145 93bfe6082cSmrgAuthor: Miroslav Koškár <mk@mkoskar.com> 94bfe6082cSmrgDate: Mon Jul 6 07:48:48 2020 +0200 95bfe6082cSmrg 96bfe6082cSmrg Fix lockdevbtn to be XkbSA_LockDeviceBtn action 97bfe6082cSmrg 98bfe6082cSmrgcommit 101d5f2bce9ee13521fe9cb47b7cfd00d01f5914 99bfe6082cSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 100bfe6082cSmrgDate: Thu Jul 23 10:25:08 2020 -0700 101bfe6082cSmrg 102bfe6082cSmrg Fix spelling/wording issues 103bfe6082cSmrg 104bfe6082cSmrg Found by using: 105bfe6082cSmrg codespell --builtin clear,rare,usage,informal,code,names 106bfe6082cSmrg 107bfe6082cSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 108bfe6082cSmrg 109bfe6082cSmrgcommit c8cfca25ab2ed65013448f7502bae933c66390ae 110bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 111bfe6082cSmrgDate: Fri Jun 5 14:23:09 2020 +1000 112bfe6082cSmrg 113bfe6082cSmrg Don't pretend unresolved symbols are an error 114bfe6082cSmrg 115bfe6082cSmrg Whenever xkeyboard-config is newer than xorgproto, or libX11 just hasn't yet 116bfe6082cSmrg been rebuilt against the protocol we end up with some unresolved symbols. 117bfe6082cSmrg That's not an error, it just happens. Let's downgrade this to a warning 118bfe6082cSmrg instead. 119bfe6082cSmrg 120bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 121bfe6082cSmrg 122bfe6082cSmrgcommit dcaa947c488b4cb458946ab9c19579f7c866cbd4 123bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 124bfe6082cSmrgDate: Wed Jul 17 15:07:14 2019 +1000 125bfe6082cSmrg 126bfe6082cSmrg For -R and after chdir, add the current directory to the path 127bfe6082cSmrg 128bfe6082cSmrg This restores the behavior pre 1aecdffaa0db7bbf85bc0aae9043e9437b25c30d, at 129bfe6082cSmrg least when -R is given. For a normal invocation without -R we don't add the 130bfe6082cSmrg current directory, because 1aecdff isn't totally wrong about whether that's a 131bfe6082cSmrg good idea. 132bfe6082cSmrg 133bfe6082cSmrg Fixes https://gitlab.freedesktop.org/xorg/app/xkbcomp/issues/3 134bfe6082cSmrg 135bfe6082cSmrgcommit d373c9b434c603bf6a5eb442b6427992d23ef874 136bfe6082cSmrgAuthor: Matt Turner <mattst88@gmail.com> 137bfe6082cSmrgDate: Thu Feb 20 09:47:30 2020 -0800 138bfe6082cSmrg 139bfe6082cSmrg xkbcomp 1.4.3 140bfe6082cSmrg 141bfe6082cSmrg Signed-off-by: Matt Turner <mattst88@gmail.com> 142bfe6082cSmrg 143bfe6082cSmrgcommit e200d0d41ef3158ea717206c1490e499a0c07f1b 144bfe6082cSmrgAuthor: Dimitry Andric <dimitry@andric.com> 145bfe6082cSmrgDate: Wed Feb 19 21:24:59 2020 +0100 146bfe6082cSmrg 147bfe6082cSmrg Don't compare with string literals 148bfe6082cSmrg 149bfe6082cSmrg xkbcomp.c:228:37: error: result of comparison against a string literal is unspecified (use an explicit string comparison function instead) [-Werror,-Wstring-compare] 150bfe6082cSmrg if ((argv[i][0] != '-') || (uStringEqual(argv[i], "-"))) 151bfe6082cSmrg ^~~~~~~~~~~~~~~~~~~~~~~~~~ 152bfe6082cSmrg ./utils.h:195:30: note: expanded from macro 'uStringEqual' 153bfe6082cSmrg ^~~~~~~~~~~~~~~~~~~~~ 154bfe6082cSmrg ./utils.h:198:38: note: expanded from macro 'uStringCompare' 155bfe6082cSmrg (s1)!=(s2):strcmp(s1,s2)) 156bfe6082cSmrg ^ ~~~~ 157bfe6082cSmrg 158bfe6082cSmrg Don't attempt to do this macro trickery, and simply use strcmp instead, 159bfe6082cSmrg where it applies. 160bfe6082cSmrg 161bfe6082cSmrg Bug: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244235 162bfe6082cSmrg 163bfe6082cSmrgcommit 29fda8e50e4a4a127348e63fcf9f47600beab93c 164bfe6082cSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 165bfe6082cSmrgDate: Thu Jun 13 12:29:19 2019 +1000 166bfe6082cSmrg 167bfe6082cSmrg Error out if we have no default path 168bfe6082cSmrg 169bfe6082cSmrg The path is set through configure.ac/Makefile.am and always defined anyway. 170bfe6082cSmrg Let's not re-define it here with a different value than our default. 171bfe6082cSmrg 172bfe6082cSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 173bfe6082cSmrg 174bfe6082cSmrgcommit ff0e59084d6b9f2e7085fc88ba68916150085afb 175bfe6082cSmrgAuthor: Andreas Wettstein <wettstein509@solnet.ch> 176bfe6082cSmrgDate: Sat Feb 15 17:34:41 2014 +0100 177bfe6082cSmrg 178bfe6082cSmrg xkbcomp Fix missing support for "affect" and incorrect modifier handling for ISOLock 179bfe6082cSmrg 180bfe6082cSmrg Add missing support for "affect" flag to selectively affect locking or 181bfe6082cSmrg unlocking for for modifier locking, control locking, and ISOLock. 182bfe6082cSmrg Fix some incorrect masking and modifier handling for ISOLock. 183bfe6082cSmrg 184bfe6082cSmrg Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch> 185bfe6082cSmrg Reviewed-By: Ran Benita <ran234@gmail.com> 186bfe6082cSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 187bfe6082cSmrg 188bfe6082cSmrgcommit 9edd61b91a02bda31fc6edd2c32c553e872b6ea2 189bfe6082cSmrgAuthor: Miroslav Koškár <mk@mkoskar.com> 190bfe6082cSmrgDate: Fri Jan 18 20:01:01 2019 +0100 191bfe6082cSmrg 192bfe6082cSmrg Fix invalid error report on F_Accel field 193bfe6082cSmrg 194bfe6082cSmrg F_Accel is valid MovePtr field yet following error is reported: 195bfe6082cSmrg 196bfe6082cSmrg > Error: Field accel is not defined for an action of type MovePtr 197bfe6082cSmrg > Action definition ignored 198bfe6082cSmrg 199bfe6082cSmrg Signed-off-by: Miroslav Koškár <mk@mkoskar.com> 200bfe6082cSmrg 201bfe6082cSmrgcommit 7ffec6583ae92fe81402870eb89dea21ca34e933 202bfe6082cSmrgAuthor: Andreas Boll <andreas.boll.dev@gmail.com> 203bfe6082cSmrgDate: Mon Feb 11 21:44:51 2019 +0100 204bfe6082cSmrg 205bfe6082cSmrg configure: Remove unused AC_SUBST([REQUIRED_MODULES]) 206bfe6082cSmrg 207bfe6082cSmrg v2: Add square brackets back. 208bfe6082cSmrg 209bfe6082cSmrg Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com> 210bfe6082cSmrg 211bfe6082cSmrgcommit 4683410b6b072bd55dbdc661c76a5ba30bae608e 212bfe6082cSmrgAuthor: Andreas Boll <andreas.boll.dev@gmail.com> 213bfe6082cSmrgDate: Mon Feb 11 21:31:19 2019 +0100 214bfe6082cSmrg 215bfe6082cSmrg pkgconfig: Remove unneeded Requires.private 216bfe6082cSmrg 217bfe6082cSmrg Fixes "pkg-config --exists xkbcomp" without installed pkg-config files 218bfe6082cSmrg for x11, xkbfile, and xproto >= 7.0.17. 219bfe6082cSmrg 220bfe6082cSmrg xkbcomp works fine without those pkg-config files. 221bfe6082cSmrg 222bfe6082cSmrg https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=913359 223bfe6082cSmrg 224bfe6082cSmrg Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com> 225bfe6082cSmrg 226bfe6082cSmrgcommit 1fdbacbe34742328b2a95742982b6017f60a1342 227bfe6082cSmrgAuthor: Adam Jackson <ajax@redhat.com> 228bfe6082cSmrgDate: Wed Oct 17 11:44:37 2018 -0400 229bfe6082cSmrg 230bfe6082cSmrg Suppress high-keycode warnings at the default warning level 231bfe6082cSmrg 232bfe6082cSmrg We expect evdev to have keycodes above 255, there's no reason to warn 233bfe6082cSmrg about this. 234bfe6082cSmrg 235bfe6082cSmrg Signed-off-by: Adam Jackson <ajax@redhat.com> 236bfe6082cSmrg 237bfe6082cSmrgcommit 32d8d53fc1b622d97b3b8eb7b8b5e8354eda60a5 238bfe6082cSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 239bfe6082cSmrgDate: Wed Nov 21 17:11:16 2018 -0800 240bfe6082cSmrg 241bfe6082cSmrg Update configure.ac bug URL for gitlab migration 242bfe6082cSmrg 243bfe6082cSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 244bfe6082cSmrg 245b60292e0Smrgcommit 2abe23d23d3755335c10ff573e4e1f93b682e9d9 246b60292e0SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 247b60292e0SmrgDate: Fri Jun 8 09:10:03 2018 +1000 248b60292e0Smrg 249b60292e0Smrg xkbcomp 1.4.2 250b60292e0Smrg 251b60292e0Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 252b60292e0Smrg 253b60292e0Smrgcommit 5bc2849273a224a2df593b7e8df31f0bde666482 254b60292e0SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 255b60292e0SmrgDate: Thu Jun 7 11:25:01 2018 +1000 256b60292e0Smrg 257b60292e0Smrg Ignore xkb_keycodes.maximum of > 255 258b60292e0Smrg 259b60292e0Smrg Continuation from 7fdfabd75 "keycodes: Ignore high keycodes" 260b60292e0Smrg 261b60292e0Smrg A keymap with a key > 255 will have a xkb_keycodes.maximum of that keycode. 262b60292e0Smrg Let's not throw a fatal error on that, just crop it back to the maximum of 263b60292e0Smrg 255. This doesn't set the "high_keycode_warned" on purpose so we get this for 264b60292e0Smrg the first key that actually matters. 265b60292e0Smrg 266b60292e0Smrg Reproducible with xkeyboard-config 2.24 which has a maximum of 374. 267b60292e0Smrg 268b60292e0Smrg https://bugzilla.redhat.com/show_bug.cgi?id=1587998 269b60292e0Smrg 270b60292e0Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 271b60292e0Smrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 272b60292e0Smrg 2735c4ee2b5Smrgcommit 34842845b191082fd1cfff3b7038332cdcadb825 2745c4ee2b5SmrgAuthor: Adam Jackson <ajax@redhat.com> 2755c4ee2b5SmrgDate: Thu Mar 1 11:15:18 2018 -0500 2765c4ee2b5Smrg 2775c4ee2b5Smrg xkbcomp 1.4.1 2785c4ee2b5Smrg 2795c4ee2b5Smrg Signed-off-by: Adam Jackson <ajax@redhat.com> 2805c4ee2b5Smrg 2815c4ee2b5Smrgcommit 993d4916a92b56b5043cf0b90f550568c817ad2b 2825c4ee2b5SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 2835c4ee2b5SmrgDate: Tue Feb 13 13:48:46 2018 +1000 2845c4ee2b5Smrg 2855c4ee2b5Smrg pkgconfig: add the exec_prefix substitution 2865c4ee2b5Smrg 2875c4ee2b5Smrg bindir gets replaced with: 2885c4ee2b5Smrg bindir=${exec_prefix}/bin 2895c4ee2b5Smrg but exec_prefix isn't set so we end up with an invalid bindir. 2905c4ee2b5Smrg 2915c4ee2b5Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 2925c4ee2b5Smrg Reviewed-by: Jon Turney <jon.turney@dronecode.org.uk> 2935c4ee2b5Smrg 2945c4ee2b5Smrgcommit 3e2a6ad4edfbf21c3f76f8319f0039b7f589944f 2955c4ee2b5SmrgAuthor: Adam Jackson <ajax@redhat.com> 2965c4ee2b5SmrgDate: Mon Nov 6 12:54:41 2017 -0500 2975c4ee2b5Smrg 2985c4ee2b5Smrg pkgconfig: Add our bindir to xkbcomp.pc 2995c4ee2b5Smrg 3005c4ee2b5Smrg Reviewed-by: Daniel Stone <daniels@collabora.com> 3015c4ee2b5Smrg Signed-off-by: Adam Jackson <ajax@redhat.com> 3025c4ee2b5Smrg 303f757b1e9Smrgcommit 3fcd5f4490adee266eb4c0110d058c7f4e515e36 304f757b1e9SmrgAuthor: Daniel Stone <daniels@collabora.com> 305f757b1e9SmrgDate: Mon May 1 15:59:28 2017 +0100 306f757b1e9Smrg 307f757b1e9Smrg xkbcomp 1.4.0 308f757b1e9Smrg 309f757b1e9Smrg Signed-off-by: Daniel Stone <daniels@collabora.com> 310f757b1e9Smrg 311f757b1e9Smrgcommit 7fdfabd753a39dbdcfcfa65ec33d0192448119d8 312f757b1e9SmrgAuthor: Daniel Stone <daniels@collabora.com> 313f757b1e9SmrgDate: Thu Apr 6 15:52:10 2017 +0100 314f757b1e9Smrg 315f757b1e9Smrg keycodes: Ignore high keycodes 316f757b1e9Smrg 317f757b1e9Smrg Rather than throwing a fatal error when a keycode definition exceeds the 318f757b1e9Smrg declared maximum (i.e. 255), just ignore the definition and continue. 319f757b1e9Smrg 320f757b1e9Smrg This allows xkeyboard-config to start shipping datasets including high 321f757b1e9Smrg keycodes, which will work in xkbcommon as it ignores explicit range 322f757b1e9Smrg declarations. 323f757b1e9Smrg 324f757b1e9Smrg Signed-off-by: Daniel Stone <daniels@collabora.com> 325f757b1e9Smrg Reviewed-by: Ran Benita <ran234@gmail.com> 326f757b1e9Smrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 327f757b1e9Smrg Reported-by: Christian Kellner <gicmo@gnome.org> 328f757b1e9Smrg 329f757b1e9Smrgcommit 9f1e3e8c8914b349b9b52501bb4acadedb31081d 330f757b1e9SmrgAuthor: Mihail Konev <k.mvc@ya.ru> 331f757b1e9SmrgDate: Thu Jan 26 14:00:21 2017 +1000 332f757b1e9Smrg 333f757b1e9Smrg autogen: add default patch prefix 334f757b1e9Smrg 335f757b1e9Smrg Signed-off-by: Mihail Konev <k.mvc@ya.ru> 336f757b1e9Smrg 337f757b1e9Smrgcommit 6f16a2e38667bea33e0cb566734a87c2b92c9391 338f757b1e9SmrgAuthor: Emil Velikov <emil.l.velikov@gmail.com> 339f757b1e9SmrgDate: Mon Mar 9 12:00:52 2015 +0000 340f757b1e9Smrg 341f757b1e9Smrg autogen.sh: use quoted string variables 342f757b1e9Smrg 343f757b1e9Smrg Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent 344f757b1e9Smrg fall-outs, when they contain space. 345f757b1e9Smrg 346f757b1e9Smrg Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> 347f757b1e9Smrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 348f757b1e9Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 349f757b1e9Smrg 350f757b1e9Smrgcommit bbc55549ee44830747eccfadd61df3ed38a99202 351f757b1e9SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 352f757b1e9SmrgDate: Tue Jan 24 10:32:07 2017 +1000 353f757b1e9Smrg 354f757b1e9Smrg autogen.sh: use exec instead of waiting for configure to finish 355f757b1e9Smrg 356f757b1e9Smrg Syncs the invocation of configure with the one from the server. 357f757b1e9Smrg 358f757b1e9Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 359f757b1e9Smrg Reviewed-by: Emil Velikov <emil.velikov@collabora.com> 360f757b1e9Smrg 361f757b1e9Smrgcommit 8995ac58e15595de9158c2d8df9e02b0c925e8f4 362f757b1e9SmrgAuthor: Ran Benita <ran234@gmail.com> 363f757b1e9SmrgDate: Wed Jan 6 21:32:52 2016 +0100 364f757b1e9Smrg 365f757b1e9Smrg When a file contains several maps, look for a default map 366f757b1e9Smrg 367f757b1e9Smrg Rather than always taking the first one in the file. This is exactly the 368f757b1e9Smrg intended use of the 'default' flag. 369f757b1e9Smrg 370f757b1e9Smrg Note that pretty much the same code is duplicated in xkbcomp.c when 371f757b1e9Smrg compiling a single file from the command line, but there it is 372f757b1e9Smrg implemented correctly (look for XkbLC_Default). 373f757b1e9Smrg 374f757b1e9Smrg https://bugs.freedesktop.org/show_bug.cgi?id=69950 375f757b1e9Smrg 376f757b1e9Smrg Signed-off-by: Ran Benita <ran234@gmail.com> 377f757b1e9Smrg Tested-by: Benno Schulenberg <bensberg@justemail.net> 378f757b1e9Smrg Acked-by: Sergey Udaltsov <sergey.udaltsov@gmail.com> 379f757b1e9Smrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 380f757b1e9Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 381f757b1e9Smrg 382f757b1e9Smrgcommit bf4d7d059daf5c6f81d70f8d3e5e2a87265381b7 383f757b1e9SmrgAuthor: Benno Schulenberg <bensberg@justemail.net> 384f757b1e9SmrgDate: Thu Sep 11 22:04:21 2014 +0200 385f757b1e9Smrg 386f757b1e9Smrg When overriding a key, adjust also its number of levels (#57242). 387f757b1e9Smrg 388f757b1e9Smrg Specifying an explicit key type when overriding a key should adjust 389f757b1e9Smrg the number of levels to that of the specified type. This gets rid of 390f757b1e9Smrg the age-old warning of the right Alt key being ONE_LEVEL but having 391f757b1e9Smrg two symbols assigned. 392f757b1e9Smrg 393f757b1e9Smrg Fixes bug #57242 <http://bugs.freedesktop.org/show_bug.cgi?id=57242>. 394f757b1e9Smrg 395f757b1e9Smrg Signed-off-by: Benno Schulenberg <bensberg@justemail.net> 396f757b1e9Smrg Reviewed-by: Ran Benita <ran234@gmail.com> 397f757b1e9Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 398f757b1e9Smrg 3993fb1fa07Smrgcommit f909259b1da70bc145f19e5ce595c8e945a2a808 4003fb1fa07SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 4013fb1fa07SmrgDate: Thu Nov 5 12:19:22 2015 +1000 4023fb1fa07Smrg 4033fb1fa07Smrg xkbcomp 1.3.1 4043fb1fa07Smrg 4053fb1fa07Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 4063fb1fa07Smrg 4073fb1fa07Smrgcommit 26d1c57a938ce5c0d4fd9d645ace25308e6a7070 4083fb1fa07SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 4093fb1fa07SmrgDate: Tue Nov 3 09:01:19 2015 +1000 4103fb1fa07Smrg 4113fb1fa07Smrg symbols: increase the warning level for shortening a key type 4123fb1fa07Smrg 4133fb1fa07Smrg Any use of the german keyboard layout or anything else using 4143fb1fa07Smrg level3(ralt_switch) produces the warning 4153fb1fa07Smrg Type "ONE_LEVEL" has 1 levels, but <RALT> has 2 symbols 4163fb1fa07Smrg Ignoring extra symbols 4173fb1fa07Smrg This warning is meaningless, the default definition for RALT comes from 4183fb1fa07Smrg pc(pc105) including altwin(meta_alt) which defines it as TWO_LEVEL 4193fb1fa07Smrg and { Alt_R, Meta_R }. Including level3(ralt_switch) correctly sets it as 4203fb1fa07Smrg ONE_LEVEL but now we get the warning. That makes users file bug reports and we 4213fb1fa07Smrg can't be having that, can we? 4223fb1fa07Smrg 4233fb1fa07Smrg Up the warning level for this case to one past the default. The warning is 4243fb1fa07Smrg only useful when you're testing a new keyboard layout or trying to fix an 4253fb1fa07Smrg actual bug with missing symbols. And then you can run xkbcomp with -w10. 4263fb1fa07Smrg No need to spam the log on every server startup. 4273fb1fa07Smrg 4283fb1fa07Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 4293fb1fa07Smrg Reviewed-by: Hans de Goede <hdegoede@redhat.com> 4303fb1fa07Smrg 4313fb1fa07Smrgcommit 511adde23a0518db0379b444580b63edcb9138a8 4323fb1fa07SmrgAuthor: Matthew Green <mrg@NetBSD.org> 4333fb1fa07SmrgDate: Tue Jul 28 17:53:48 2015 +0200 4343fb1fa07Smrg 4353fb1fa07Smrg Adjust a NUL-string assignment to avoid const issues. 4363fb1fa07Smrg 4373fb1fa07Smrg Signed-off-by: Thomas Klausner <wiz@NetBSD.org> 4383fb1fa07Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 4393fb1fa07Smrg 4403fb1fa07Smrgcommit 1ae525b3d236b59e6437b2b5433d460e18370973 4413fb1fa07SmrgAuthor: Jon TURNEY <jon.turney@dronecode.org.uk> 4423fb1fa07SmrgDate: Tue Mar 17 15:19:10 2015 +0000 4433fb1fa07Smrg 4443fb1fa07Smrg Define WIN32_LEAN_AND_MEAN when building on Win32 4453fb1fa07Smrg 4463fb1fa07Smrg w32api/rpcnndr.h (included by windows.h) uses TypeString as the name of a structure member. 4473fb1fa07Smrg 4483fb1fa07Smrg xkbcomp.h defines it as a macro for a constant. 4493fb1fa07Smrg 4503fb1fa07Smrg Define WIN32_LEAN_AND_MEAN to avoid this clash. 4513fb1fa07Smrg 4523fb1fa07Smrg Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> 4533fb1fa07Smrg Reviewed-by: David Macek <david.macek.0@gmail.com> 4543fb1fa07Smrg 4553fb1fa07Smrgcommit fc3e6ddb2c8e922ea80f2dc5cbc1df2102e30d99 4563fb1fa07SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 4573fb1fa07SmrgDate: Tue Mar 3 16:24:50 2015 -0800 4583fb1fa07Smrg 4593fb1fa07Smrg Stop including <X11/Xalloca.h> in parseutils.c 4603fb1fa07Smrg 4613fb1fa07Smrg I can not find any point in our git history at which alloca() or the 4623fb1fa07Smrg Xalloca.h macros ALLOCATE_LOCAL() & DEALLOCATE_LOCAL() were actually 4633fb1fa07Smrg used in this source file. 4643fb1fa07Smrg 4653fb1fa07Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 4663fb1fa07Smrg 467c82dfdfbSmrgcommit 1e8ee9d0aad072f04186df84752f5636340574e0 468c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 469c82dfdfbSmrgDate: Fri Nov 21 08:18:41 2014 +1000 470c82dfdfbSmrg 471c82dfdfbSmrg xkbcomp 1.3.0 472c82dfdfbSmrg 473c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 474c82dfdfbSmrg 475c82dfdfbSmrgcommit 978998a1fe0a78829452f5432efe1b74c5049de4 476c82dfdfbSmrgAuthor: Vincent Lefevre <vincent@vinc17.net> 477c82dfdfbSmrgDate: Mon Oct 27 10:50:30 2014 +0100 478c82dfdfbSmrg 479c82dfdfbSmrg xkbcomp: Improved -w option parsing 480c82dfdfbSmrg 481c82dfdfbSmrg This patch improves -w option parsing even further, for cases like 482c82dfdfbSmrg "xkbcomp -w6 4.xkb out.xkb" (which were not handled by the fix of 483c82dfdfbSmrg the warning level is still optional (set to 0 if not present), and 484c82dfdfbSmrg errors like "xkbcomp -wfoo in out" are detected and reported. 485c82dfdfbSmrg 486c82dfdfbSmrg https://bugs.freedesktop.org/show_bug.cgi?id=66344 487c82dfdfbSmrg 488c82dfdfbSmrg Signed-off-by: Vincent Lefevre <vincent@vinc17.net> 489c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 490c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 491c82dfdfbSmrg 492c82dfdfbSmrgcommit d4e02a09258063c6d024c3ccd42d6b22212e6e18 493c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 494c82dfdfbSmrgDate: Sat Mar 8 19:04:24 2014 -0800 495c82dfdfbSmrg 496c82dfdfbSmrg Initialize nMatch even if WIN32 is defined 497c82dfdfbSmrg 498c82dfdfbSmrg Flagged by cppcheck 1.64: 499c82dfdfbSmrg Checking app/xkbcomp/listing.c: WIN32... 500c82dfdfbSmrg [app/xkbcomp/listing.c:335]: (error) Uninitialized variable: nMatch 501c82dfdfbSmrg 502c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 503c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 504c82dfdfbSmrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 505c82dfdfbSmrg 506c82dfdfbSmrgcommit 7606a46b922dfdb0627f1af6ab1432ae88c79d66 507c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 508c82dfdfbSmrgDate: Sat Mar 8 19:01:12 2014 -0800 509c82dfdfbSmrg 510c82dfdfbSmrg Remove useless assignment to 'outline' variable 511c82dfdfbSmrg 512c82dfdfbSmrg Flagged by cppcheck 1.64: 513c82dfdfbSmrg [app/xkbcomp/geometry.c:2426] -> [app/xkbcomp/geometry.c:2427]: 514c82dfdfbSmrg (performance) Variable 'outline' is reassigned a value before 515c82dfdfbSmrg the old one has been used. 516c82dfdfbSmrg 517c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 518c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 519c82dfdfbSmrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 520c82dfdfbSmrg 521c82dfdfbSmrgcommit 6c2d3b0891f7be6ef4895be75188aa1c6f530bfc 522c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 523c82dfdfbSmrgDate: Sat Mar 8 18:50:22 2014 -0800 524c82dfdfbSmrg 525c82dfdfbSmrg Don't dereference the pointer whose allocation failed 526c82dfdfbSmrg 527c82dfdfbSmrg Flagged by cppcheck 1.64: 528c82dfdfbSmrg [app/xkbcomp/keycodes.c:264] -> [app/xkbcomp/keycodes.c:262]: 529c82dfdfbSmrg (warning) Possible null pointer dereference: new - otherwise it 530c82dfdfbSmrg is redundant to check it against null. 531c82dfdfbSmrg [app/xkbcomp/keytypes.c:600] -> [app/xkbcomp/keytypes.c:597]: 532c82dfdfbSmrg (warning) Possible null pointer dereference: old - otherwise it 533c82dfdfbSmrg is redundant to check it against null. 534c82dfdfbSmrg 535c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 536c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 537c82dfdfbSmrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 538c82dfdfbSmrg 539c82dfdfbSmrgcommit 50ebe95a32dc59b1de899ef08f72462055b04065 540c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 541c82dfdfbSmrgDate: Sat Mar 8 18:46:11 2014 -0800 542c82dfdfbSmrg 543c82dfdfbSmrg Remove useless checks for NULL before free in OverlayKeyCreate() 544c82dfdfbSmrg 545c82dfdfbSmrg There is no need to ensure the pointers passed to free are not NULL, 546c82dfdfbSmrg especially right after passing them to strncpy without checking for 547c82dfdfbSmrg NULL. 548c82dfdfbSmrg 549c82dfdfbSmrg Flagged by cppcheck 1.64: 550c82dfdfbSmrg [app/xkbcomp/parseutils.c:557] -> [app/xkbcomp/parseutils.c:559]: 551c82dfdfbSmrg (warning) Possible null pointer dereference: over - otherwise it 552c82dfdfbSmrg is redundant to check it against null. 553c82dfdfbSmrg [app/xkbcomp/parseutils.c:558] -> [app/xkbcomp/parseutils.c:561]: 554c82dfdfbSmrg (warning) Possible null pointer dereference: under - otherwise it 555c82dfdfbSmrg is redundant to check it against null. 556c82dfdfbSmrg 557c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 558c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 559c82dfdfbSmrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 560c82dfdfbSmrg 561c82dfdfbSmrgcommit 31b90ee4ffc774e0da540277907fc5540c0b012c 562c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 563c82dfdfbSmrgDate: Mon Feb 3 07:24:22 2014 +1000 564c82dfdfbSmrg 565c82dfdfbSmrg man: replace default include directory with the one from configure 566c82dfdfbSmrg 567c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 568c82dfdfbSmrg Reviewed-by: Gaetan Nadon <memsize@videotron.ca> 569c82dfdfbSmrg 570c82dfdfbSmrgcommit e3e6e938535532bfad175c1635256ab7fb3ac943 571c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 572c82dfdfbSmrgDate: Sun Oct 20 12:36:31 2013 -0700 573c82dfdfbSmrg 574c82dfdfbSmrg Fix many const char * warnings from gcc 575c82dfdfbSmrg 576c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 577c82dfdfbSmrg Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 578c82dfdfbSmrg 579c82dfdfbSmrgcommit 2458580ac95c550217b3376c46eecb2cca646241 580c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 581c82dfdfbSmrgDate: Sun Oct 20 11:52:43 2013 -0700 582c82dfdfbSmrg 583c82dfdfbSmrg Convert remaining sprintf calls to snprintf 584c82dfdfbSmrg 585c82dfdfbSmrg Most were fixed length or length checked anyway, this just saves time 586c82dfdfbSmrg doublechecking that. (A few could be replaced by asprintf, but we 587c82dfdfbSmrg don't have a copy guaranteed to be reachable from this program yet.) 588c82dfdfbSmrg 589c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 590c82dfdfbSmrg Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 591c82dfdfbSmrg 592c82dfdfbSmrgcommit 3ed68e06cb45fb526b09e4c7b7c3d60de552b2b3 593c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 594c82dfdfbSmrgDate: Sun Oct 20 12:49:31 2013 -0700 595c82dfdfbSmrg 596c82dfdfbSmrg Remove unused uASSERT macro 597c82dfdfbSmrg 598c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 599c82dfdfbSmrg Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 600c82dfdfbSmrg 601c82dfdfbSmrgcommit c936bd4315a7dc78de074ac89c5a4d12813421be 602c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 603c82dfdfbSmrgDate: Sun Oct 20 11:58:56 2013 -0700 604c82dfdfbSmrg 605c82dfdfbSmrg Remove unused function entry/exit tracking framework 606c82dfdfbSmrg 607c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 608c82dfdfbSmrg Reviewed-by: Jasper St. Pierre <jstpierre@mecheye.net> 609c82dfdfbSmrg 610c82dfdfbSmrgcommit 839ccda42d8b088d94324cd77c4be954859914d3 611c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 612c82dfdfbSmrgDate: Wed Aug 28 15:20:56 2013 +1000 613c82dfdfbSmrg 614c82dfdfbSmrg compat: don't warn about redefinition when nothing is defined yet 615c82dfdfbSmrg 616c82dfdfbSmrg info->groupCompat[i] is bzero'd on init, define is 0. Don't warn when that 617c82dfdfbSmrg is the case, otherwise any "group 2 = ..." statement will cause an error. 618c82dfdfbSmrg 619c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 620c82dfdfbSmrg 621c82dfdfbSmrgcommit 24d18e0a844041ef82441adb16aa18cc4b4814ae 622c82dfdfbSmrgAuthor: Benno Schulenberg <bensberg@justemail.net> 623c82dfdfbSmrgDate: Wed Aug 28 20:03:30 2013 +0200 624c82dfdfbSmrg 625c82dfdfbSmrg Making sure that a copied string is always null-terminated (#66345). 626c82dfdfbSmrg 627c82dfdfbSmrg A more minimalistic and formally correct solution. 628c82dfdfbSmrg This amends and extends the previous fix for bug #66345, 629c82dfdfbSmrg fixing not just yyGetKeyName() but also yyGetString(). 630c82dfdfbSmrg 631c82dfdfbSmrg Signed-off-by: Benno Schulenberg <bensberg@justemail.net> 632c82dfdfbSmrg 633c82dfdfbSmrg Fixes a typo from cdcd552 (should be sizeof - 1, not sizeof -i). 634c82dfdfbSmrg Code flows that i is at most sizeof(scanBuf) - 1, so last is not needed. 635c82dfdfbSmrg 636c82dfdfbSmrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 637c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 638c82dfdfbSmrg 639c82dfdfbSmrgcommit 0ebdf47fd4bc434ac3d2339544c022a869510738 640c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 641c82dfdfbSmrgDate: Thu Jul 11 13:53:31 2013 +1000 642c82dfdfbSmrg 643c82dfdfbSmrg Parse -w1 flag correctly (#66344) 644c82dfdfbSmrg 645c82dfdfbSmrg if the flag is "-w", then argv[i][1] is 'w' and unlikely to be a digit. 646c82dfdfbSmrg Access [2] instead, which is either \0 or an actual digit. 647c82dfdfbSmrg 648c82dfdfbSmrg X.Org Bug 66344 <http://bugs.freedesktop.org/show_bug.cgi?id=66344> 649c82dfdfbSmrg 650c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 651c82dfdfbSmrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 652c82dfdfbSmrg Reviewed-by: Matt Dew <marcoz@osource.org> 653c82dfdfbSmrg 654c82dfdfbSmrgcommit cdcd552041fc1325a2a81e3374fadb0dd15950dc 655c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 656c82dfdfbSmrgDate: Thu Jul 11 13:26:18 2013 +1000 657c82dfdfbSmrg 658c82dfdfbSmrg Always terminate the scanBuf string (#66345) 659c82dfdfbSmrg 660c82dfdfbSmrg If a key name exceeds 4 characters, the content of scanBuf is not 661c82dfdfbSmrg null-terminated, giving error messages like 662c82dfdfbSmrg 663c82dfdfbSmrg syntax error: line 7 of test.xkb 664c82dfdfbSmrg last scanned symbol is: FOOBARm 665c82dfdfbSmrg Errors encountered in test.xkb; not compiled. 666c82dfdfbSmrg 667c82dfdfbSmrg (last character of the preceding 'maximum' statement in this case) 668c82dfdfbSmrg 669c82dfdfbSmrg X.Org Bug 66345 <http://bugs.freedesktop.org/show_bug.cgi?id=66345> 670c82dfdfbSmrg 671c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 672c82dfdfbSmrg 673c82dfdfbSmrgcommit 1cd5c50c54b06de2238d6d7675d0a3c65a21414d 674c82dfdfbSmrgAuthor: Laura <lmemsm@gmail.com> 675c82dfdfbSmrgDate: Fri Mar 15 11:21:26 2013 +0000 676c82dfdfbSmrg 677c82dfdfbSmrg Add #include <stdlib.h> to xkbscan.c 678c82dfdfbSmrg 679c82dfdfbSmrg This fixes an issue with _exit not declared when building xkbcomp 680c82dfdfbSmrg version 1.2.4 natively on Windows using MinGW32 (version 4.7.2) 681c82dfdfbSmrg from www.mingw.org. 682c82dfdfbSmrg 683c82dfdfbSmrg https://bugs.freedesktop.org/show_bug.cgi?id=62365 684c82dfdfbSmrg 685c82dfdfbSmrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 686c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 687c82dfdfbSmrg 688c82dfdfbSmrgcommit ed582f4fccd4e23abcfba8b3b03649fea6414f44 689c82dfdfbSmrgAuthor: Thomas Klausner <wiz@NetBSD.org> 690c82dfdfbSmrgDate: Sun Jun 2 22:22:36 2013 +0200 691c82dfdfbSmrg 692c82dfdfbSmrg Protect config.h like usual. 693c82dfdfbSmrg 694c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 695c82dfdfbSmrg 696c82dfdfbSmrgcommit c66de126ad10a7220ab74e52fb7cc81b6d8b0993 697c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 698c82dfdfbSmrgDate: Tue May 21 15:19:35 2013 +1000 699c82dfdfbSmrg 700c82dfdfbSmrg man: document -help/-?, -em1, -emp, -eml 701c82dfdfbSmrg 702c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 703c82dfdfbSmrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 704c82dfdfbSmrg 705c82dfdfbSmrgcommit a4ff0f0eee046be846cc0f46edaba48b765e50d3 706c82dfdfbSmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 707c82dfdfbSmrgDate: Tue Apr 9 11:29:15 2013 +1000 708c82dfdfbSmrg 709c82dfdfbSmrg Use DEBUG, not DEBUG_ON to determine whether debugging is enabled 710c82dfdfbSmrg 711c82dfdfbSmrg Nothing else looks at DEBUG_ON. 712c82dfdfbSmrg 713c82dfdfbSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 714c82dfdfbSmrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 715c82dfdfbSmrg 716c82dfdfbSmrgcommit 705b9bbb426410f9510601c7010da51184919b36 717c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 718c82dfdfbSmrgDate: Tue Jan 22 22:39:19 2013 -0800 719c82dfdfbSmrg 720c82dfdfbSmrg config: Add missing AC_CONFIG_SRCDIR 721c82dfdfbSmrg 722c82dfdfbSmrg Regroup AC statements under the Autoconf initialization section. 723c82dfdfbSmrg Regroup AM statements under the Automake initialization section. 724c82dfdfbSmrg 725c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 726c82dfdfbSmrg 727c82dfdfbSmrgcommit ed1b90216e59e6b3ac6ac5fd2faca8e056c76caa 728c82dfdfbSmrgAuthor: Colin Walters <walters@verbum.org> 729c82dfdfbSmrgDate: Wed Jan 16 13:02:57 2013 -0500 730c82dfdfbSmrg 731c82dfdfbSmrg autogen.sh: Honor NOCONFIGURE=1 732c82dfdfbSmrg 733c82dfdfbSmrg See http://people.gnome.org/~walters/docs/build-api.txt 734c82dfdfbSmrg 735c82dfdfbSmrg Signed-off-by: Adam Jackson <ajax@redhat.com> 736c82dfdfbSmrg 737c82dfdfbSmrgcommit 0522fab51eec0aa3e623aa17c5b7ea3aa6dfec45 738c82dfdfbSmrgAuthor: Adam Jackson <ajax@redhat.com> 739c82dfdfbSmrgDate: Wed Jan 16 13:01:21 2013 -0500 740c82dfdfbSmrg 741c82dfdfbSmrg configure: Drop AM_MAINTAINER_MODE 742c82dfdfbSmrg 743c82dfdfbSmrg Signed-off-by: Adam Jackson <ajax@redhat.com> 744c82dfdfbSmrg 745c82dfdfbSmrgcommit e4f767913338052527538d429931e8abd8c3fb88 746c82dfdfbSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 747c82dfdfbSmrgDate: Fri Jan 4 18:37:45 2013 -0800 748c82dfdfbSmrg 749c82dfdfbSmrg unifdef -U__UNIXOS2__ 750c82dfdfbSmrg 751c82dfdfbSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 752c82dfdfbSmrg 753c82dfdfbSmrgcommit bd1103ef3cfef9cfed645566f944a69e7ca568b4 754c82dfdfbSmrgAuthor: Ryan Pavlik <rpavlik@iastate.edu> 755c82dfdfbSmrgDate: Wed Oct 26 12:17:44 2011 -0500 756c82dfdfbSmrg 757c82dfdfbSmrg Include Xwindows.h rather than windows.h 758c82dfdfbSmrg 759c82dfdfbSmrg Include the specially wrapped windows.h in Xwindows.h, rather than 760c82dfdfbSmrg including it directly to avoid compilation errors due to clashing 761c82dfdfbSmrg definitions 762c82dfdfbSmrg 763c82dfdfbSmrg Signed-off-by: Ryan Pavlik <rpavlik@iastate.edu> 764c82dfdfbSmrg Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> 765c82dfdfbSmrg Reviewed-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> 766c82dfdfbSmrg 767c82dfdfbSmrgcommit a68c5b7b29eb1433b1be73b50c4248e10eab8e64 768c82dfdfbSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 769c82dfdfbSmrgDate: Thu Nov 1 16:37:03 2012 +1100 770c82dfdfbSmrg 771c82dfdfbSmrg Reset scan state when opening a new file 772c82dfdfbSmrg 773c82dfdfbSmrg When we opened a new file after encountering a parse error, we weren't 774c82dfdfbSmrg resetting our scan state, and continued to read out of the old buffer 775c82dfdfbSmrg rather than that of the new file. 776c82dfdfbSmrg 777c82dfdfbSmrg Fixes a regression introduced in 9887842e ('Use fread() instead of 778c82dfdfbSmrg getc()'). 779c82dfdfbSmrg 780c82dfdfbSmrg Test case: 781c82dfdfbSmrg xkbcomp -lfhlpR "path/to/xkeyboard-config.git/symbols/*" 782c82dfdfbSmrg The Makefiles in that tree would cause parse errors, the resulting directory 783c82dfdfbSmrg file is incomplete (down from ~12000 to ~230 lines). 784c82dfdfbSmrg 785c82dfdfbSmrg Reported-by: Peter Hutterer <peter.hutterer@who-t.net> 786c82dfdfbSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 787c82dfdfbSmrg 788c82dfdfbSmrgcommit e119cbec7e750ffc4d4bd08b577db2c697035a30 789c82dfdfbSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 790c82dfdfbSmrgDate: Wed Oct 31 12:40:49 2012 +1100 791c82dfdfbSmrg 792c82dfdfbSmrg Add parsing support for multiple keysyms per level 793c82dfdfbSmrg 794c82dfdfbSmrg Parse, but ignore, level definitions in the form of: 795c82dfdfbSmrg key <FOO> { [ normal_sym, { M, U, L, T, I, S, Y, M } ] }; 796c82dfdfbSmrg 797c82dfdfbSmrg normal_sym will be carried, but the latter will be turned into NoSymbol. 798c82dfdfbSmrg 799c82dfdfbSmrg http://bugs.freedesktop.org/show_bug.cgi?id=25025 800c82dfdfbSmrg 801c82dfdfbSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 802c82dfdfbSmrg 8031d8c7986Smrgcommit f2eff337176551f643e35c54c1e1ca0a78df69c6 8041d8c7986SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 8051d8c7986SmrgDate: Thu Mar 22 22:02:56 2012 -0700 8061d8c7986Smrg 8071d8c7986Smrg xkbcomp 1.2.4 8081d8c7986Smrg 8091d8c7986Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 8101d8c7986Smrg 8111d8c7986Smrgcommit b4fafc4fa7edc4c04c3c0affae0d7f79a63e8d2f 8121d8c7986SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 8131d8c7986SmrgDate: Wed Dec 28 20:57:55 2011 -0800 8141d8c7986Smrg 8151d8c7986Smrg Delete redundant redeclarations of extern Atoms in symbols.c 8161d8c7986Smrg 8171d8c7986Smrg Fixes gcc warnings of: 8181d8c7986Smrg 8191d8c7986Smrg symbols.c:43: warning: redundant redeclaration of 'tok_ONE_LEVEL' 8201d8c7986Smrg tokens.h:99: warning: previous declaration of 'tok_ONE_LEVEL' was here 8211d8c7986Smrg symbols.c:44: warning: redundant redeclaration of 'tok_TWO_LEVEL' 8221d8c7986Smrg tokens.h:100: warning: previous declaration of 'tok_TWO_LEVEL' was here 8231d8c7986Smrg symbols.c:45: warning: redundant redeclaration of 'tok_KEYPAD' 8241d8c7986Smrg tokens.h:102: warning: previous declaration of 'tok_KEYPAD' was here 8251d8c7986Smrg 8261d8c7986Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 8271d8c7986Smrg 8281d8c7986Smrgcommit 3835cae3cb1ad1073cbb2711f938beb878b4986c 8291d8c7986SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 8301d8c7986SmrgDate: Wed Dec 28 20:53:45 2011 -0800 8311d8c7986Smrg 8321d8c7986Smrg Make sure to leave room for trailing nil byte in yyGetNumber 8331d8c7986Smrg 8341d8c7986Smrg ...though really, by the time you've added 1023 digits to the number 8351d8c7986Smrg you want to parse, you've got much bigger problems than an off-by-one 8361d8c7986Smrg error in your buffer count. 8371d8c7986Smrg 8381d8c7986Smrg Fixes parfait warnings: 8391d8c7986Smrg Buffer overflow (CWE 120): In array dereference of (*buf)[nInBuf] with index 'nInBuf' 8401d8c7986Smrg Array size is 1024 bytes, nInBuf >= 1 and nInBuf <= 1024 8411d8c7986Smrg at line 625 of xkbscan.c in function 'yyGetNumber'. 8421d8c7986Smrg Buffer overflow (CWE 120): In array dereference of (*buf)[nInBuf] with index 'nInBuf' 8431d8c7986Smrg Array size is 1024 bytes, nInBuf <= 1025 8441d8c7986Smrg at line 632 of xkbscan.c in function 'yyGetNumber'. 8451d8c7986Smrg 8461d8c7986Smrg [ This bug was found by the Parfait 0.4.2 bug checking tool. 8471d8c7986Smrg For more information see http://labs.oracle.com/projects/parfait/ ] 8481d8c7986Smrg 8491d8c7986Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 8501d8c7986Smrg 8511d8c7986Smrgcommit 1447071942dbbbfc37b08417c74c8a1d302c1626 8521d8c7986SmrgAuthor: Andreas Wettstein <wettstein509@solnet.ch> 8531d8c7986SmrgDate: Fri Dec 2 20:10:06 2011 +0000 8541d8c7986Smrg 8551d8c7986Smrg include resets group compatibility modifiers #43091 8561d8c7986Smrg 8571d8c7986Smrg This change makes sure that include does not overwrite previous 8581d8c7986Smrg compatibility modifier settings when the included files does not 8591d8c7986Smrg explicitly specify them. 8601d8c7986Smrg 8611d8c7986Smrg Signed-off-by: Andreas Wettstein <wettstein509@solnet.ch> 8621d8c7986Smrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 8631d8c7986Smrg 8641d8c7986Smrgcommit 5fd14db5b2cc0c2c43f7a1ddefd6f9991eb1dcc2 8651d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 8661d8c7986SmrgDate: Fri Nov 11 11:18:43 2011 -0800 8671d8c7986Smrg 8681d8c7986Smrg Silence -Wparentheses-equality 8691d8c7986Smrg 8701d8c7986Smrg warning: equality comparison with extraneous parentheses [-Wparentheses-equality] 8711d8c7986Smrg 8721d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 8731d8c7986Smrg 8741d8c7986Smrgcommit 6099655a4bbe1fd3e26b8afd2b91888ad2766086 8751d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 8761d8c7986SmrgDate: Fri Nov 11 11:17:38 2011 -0800 8771d8c7986Smrg 8781d8c7986Smrg Silence -Wshadow warnings 8791d8c7986Smrg 8801d8c7986Smrg warning: declaration shadows a local variable [-Wshadow] 8811d8c7986Smrg 8821d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 8831d8c7986Smrg 8841d8c7986Smrgcommit b7e88debd937be147d3581b9c8720c0bfe354052 8851d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 8861d8c7986SmrgDate: Fri Nov 11 11:13:42 2011 -0800 8871d8c7986Smrg 8881d8c7986Smrg Correct our zeroing out of the row in InitRowInfo 8891d8c7986Smrg 8901d8c7986Smrg geometry.c:369:20: warning: argument to 'sizeof' in '__builtin___memset_chk' call is the same 8911d8c7986Smrg pointer type 'RowInfo *' (aka 'struct _RowInfo *') as the destination; expected 'RowInfo' 8921d8c7986Smrg (aka 'struct _RowInfo') or an explicit length [-Wsizeof-pointer-memaccess] 8931d8c7986Smrg bzero(row, sizeof(RowInfo *)); 8941d8c7986Smrg ~~~~~~~~~~~^~~~~~~~~~~~~~~~~~ 8951d8c7986Smrg 8961d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 8971d8c7986Smrg 8981d8c7986Smrgcommit 33b5c9413463613d341d15184b34a4f4c4e70e56 8991d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 9001d8c7986SmrgDate: Fri Nov 11 11:12:22 2011 -0800 9011d8c7986Smrg 9021d8c7986Smrg Fix -Wformat warnings 9031d8c7986Smrg 9041d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 9051d8c7986Smrg 9061d8c7986Smrgcommit b9f6482d5fc413222334c2370ef8b9693f4b50fd 9071d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 9081d8c7986SmrgDate: Fri Nov 11 11:07:30 2011 -0800 9091d8c7986Smrg 9101d8c7986Smrg Add missing _X_NORETURN to uFatalError 9111d8c7986Smrg 9121d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 9131d8c7986Smrg 9141d8c7986Smrgcommit 8ea06128c70b07c265a217222f2a245aad4bfce4 9151d8c7986SmrgAuthor: Jeremy Huddleston <jeremyhu@apple.com> 9161d8c7986SmrgDate: Fri Nov 11 11:06:02 2011 -0800 9171d8c7986Smrg 9181d8c7986Smrg Include strings.h for strcasecmp and string.h for strdup 9191d8c7986Smrg 9201d8c7986Smrg Our minimum requirement for X11 is currently Unix98. Unix98 provides 9211d8c7986Smrg strcasecmp in <strings.h>. This commit fixes implicit declarations 9221d8c7986Smrg of this function on systems that closely adhere to the standard. 9231d8c7986Smrg 9241d8c7986Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 9251d8c7986Smrg 9261d8c7986Smrgcommit 89c8317ad84386f69d31f38dcddbc7ff0abffb31 9271d8c7986SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 9281d8c7986SmrgDate: Tue Jul 5 08:23:37 2011 +1000 9291d8c7986Smrg 9301d8c7986Smrg Add .pc file for version export 9311d8c7986Smrg 9321d8c7986Smrg Exports xkbcomp version and the xkb base directory. 9331d8c7986Smrg 9341d8c7986Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 9351d8c7986Smrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 9361d8c7986Smrg Reviewed-by: Gaetan Nadon <memsize@videotron.ca> 9371d8c7986Smrg 9381d8c7986Smrgcommit cdb8677f370b34a3a523a32ae0023c7e8c0c965c 9391d8c7986SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 9401d8c7986SmrgDate: Wed Jun 22 10:41:33 2011 +1000 9411d8c7986Smrg 9421d8c7986Smrg Print version number on -version. 9431d8c7986Smrg 9441d8c7986Smrg This commit isn't playing the WARN/M/M1 macro game. Version numbers to to 9451d8c7986Smrg stdout, full stop. 9461d8c7986Smrg 9471d8c7986Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 9481d8c7986Smrg Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 9491d8c7986Smrg 950690143ccSmrgcommit cef4ba4b8fdc9a5439f71437c08cf690a750bd6b 951690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 952690143ccSmrgDate: Tue Jun 21 16:04:45 2011 +0100 953690143ccSmrg 954690143ccSmrg Bump to 1.2.3 955690143ccSmrg 956690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 957690143ccSmrg 958690143ccSmrgcommit 3caab5aa37decb7b5dc1642a0452efc3e1f5100e 959690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 960690143ccSmrgDate: Tue Jun 21 15:55:59 2011 +0100 961690143ccSmrg 962690143ccSmrg Interp: Allow explicit Any/NoSymbol mappings 963690143ccSmrg 964690143ccSmrg Brown paper bag in full effect. 965690143ccSmrg 966690143ccSmrg The previous fix, while crushing the previous problem where an unknown 967690143ccSmrg keysym for an interp def would lead to every key matching it, also 968690143ccSmrg ignored explicit Any+AnyOfOrNone(All) mappings. 969690143ccSmrg 970690143ccSmrg Such as the one xkeyboard-config relied on for Control to actually 971690143ccSmrg update the modifier state. 972690143ccSmrg 973690143ccSmrg Fix this by allowing mappings explicitly declared as Any/NoSymbol, while 974690143ccSmrg ignoring only those with failed keysym lookups. Unfortunately, due to 975690143ccSmrg the structure of the parser, it's a deeply inelegant fix. 976690143ccSmrg 977690143ccSmrg Verified with a quick check of all layouts (albeit using default 978690143ccSmrg variants only) in xkeyboard-config that this results in no changes to 979690143ccSmrg the output at all, compared to xkbcomp 1.1.1. 980690143ccSmrg 981690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 982690143ccSmrg 983690143ccSmrgcommit b34af8b0aec3a1dfc58f9732996274cbf2646a53 984690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 985690143ccSmrgDate: Tue Jun 21 15:55:28 2011 +0100 986690143ccSmrg 987690143ccSmrg Constify LookupKeysym input argument 988690143ccSmrg 989690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 990690143ccSmrg 991690143ccSmrgcommit e68a8ef1067f98056237d8067052e2a0d9896133 992690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 993690143ccSmrgDate: Tue Jun 21 14:06:05 2011 +0100 994690143ccSmrg 995690143ccSmrg Bump to 1.2.2 996690143ccSmrg 997690143ccSmrg Emergency bugfix for the syminterp declarations. They've been broken 998690143ccSmrg since the beginning of time, but I guess we just haven't added new 999690143ccSmrg interpreted symbols since around then. 1000690143ccSmrg 1001690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 1002690143ccSmrg 1003690143ccSmrgcommit 2a473b906943ffd807ad81960c47530ee7ae9a60 1004690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1005690143ccSmrgDate: Tue Jun 21 14:03:53 2011 +0100 1006690143ccSmrg 1007690143ccSmrg Interp: Ignore NoSymbol definitions 1008690143ccSmrg 1009690143ccSmrg A NoSymbol syminterp leads to a Any+AnyOfOrAll(None) definition, which 1010690143ccSmrg is never what anyone would actually ever want in a sym interp. The 1011690143ccSmrg failure mode here was: 1012690143ccSmrg interpret XF86SomeKeysymYouDontHaveYet { 1013690143ccSmrg action=Something() 1014690143ccSmrg } 1015690143ccSmrg leading to: 1016690143ccSmrg interpret Any+AnyOfOrAll(None) { 1017690143ccSmrg action=Something() 1018690143ccSmrg } 1019690143ccSmrg leading to every single non-action key triggering your shiny new action 1020690143ccSmrg that was only supposed to come from a new keysym. 1021690143ccSmrg 1022690143ccSmrg At least you could VT switch or zap, I guess. 1023690143ccSmrg 1024690143ccSmrg Later, more invasive, revisions will bring a more useful error message. 1025690143ccSmrg 1026690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 1027690143ccSmrg 1028690143ccSmrgcommit a2816345e58c88f5806a5c6df310c7d9c62264f0 1029690143ccSmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1030690143ccSmrgDate: Tue Jun 21 14:03:12 2011 +0100 1031690143ccSmrg 1032690143ccSmrg Interp: Don't make modifier lookup failure fatal 1033690143ccSmrg 1034690143ccSmrg If we can't look up a modifier in a SymInterp declaration, don't make 1035690143ccSmrg that fatal enough to kill the entire file, just ignore it and move on. 1036690143ccSmrg 1037690143ccSmrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 1038690143ccSmrg 1039690143ccSmrgcommit c7a42b364f0ca06d9859945fa11664d0e0ea2742 1040690143ccSmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 1041690143ccSmrgDate: Tue Mar 8 08:16:35 2011 -0500 1042690143ccSmrg 1043690143ccSmrg config: move pre-processor flags to AM_CPPFLAGS 1044690143ccSmrg 1045690143ccSmrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 1046690143ccSmrg 1047690143ccSmrgcommit 7899a1f4745c8d111dab4dd3abc2b59b40ecdcbc 1048690143ccSmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 1049690143ccSmrgDate: Tue Mar 8 08:02:54 2011 -0500 1050690143ccSmrg 1051690143ccSmrg config: let Automake handle Yacc dist and cleaning 1052690143ccSmrg 1053690143ccSmrg BUILT_SOURCES and MAINTAINERCLEANFILES are already handled by Automake. 1054690143ccSmrg 1055690143ccSmrg Automake generates all the rules to handle building, 1056690143ccSmrg distribution and cleaning. 1057690143ccSmrg 1058690143ccSmrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 1059690143ccSmrg 1060690143ccSmrgcommit 137418c63d01d5db0dcaed257d7a26865efa53ae 1061690143ccSmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 1062690143ccSmrgDate: Tue Jun 7 23:47:32 2011 -0700 1063690143ccSmrg 1064690143ccSmrg Replace repeated checks for gcc with _X_ATTRIBUTE_PRINTF from xproto 1065690143ccSmrg 1066690143ccSmrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 1067690143ccSmrg Reviewed-by: Mark Kettenis <kettenis@openbsd.org> 1068690143ccSmrg 1069690143ccSmrgcommit a2877e92bd9f9c1532b5cd12cc484ff3cdbc6a0a 1070690143ccSmrgAuthor: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> 1071690143ccSmrgDate: Fri Apr 1 20:26:30 2011 +1100 1072690143ccSmrg 1073690143ccSmrg xkbcomp: Stop possible overflow in yyGetnumber. #31647 1074690143ccSmrg 1075690143ccSmrg Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=31647 1076690143ccSmrg 1077690143ccSmrg Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> 1078690143ccSmrg Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> 1079690143ccSmrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 1080690143ccSmrg 1081690143ccSmrgcommit 0b8527a3836cde77269461e22844857bf33e0aea 1082690143ccSmrgAuthor: Julien Cristau <jcristau@debian.org> 1083690143ccSmrgDate: Sun Feb 13 13:03:05 2011 +0100 1084690143ccSmrg 1085690143ccSmrg Inline the oiText macro in the only place it's used 1086690143ccSmrg 1087690143ccSmrg Gets rid of a compiler warning: 1088690143ccSmrg geometry.c: In function 'HandleOverlayDef': 1089690143ccSmrg geometry.c:2578: warning: the address of 'ol' will always evaluate as 'true' 1090690143ccSmrg 1091690143ccSmrg X.Org bug#34219 <https://bugs.freedesktop.org/show_bug.cgi?id=34219> 1092690143ccSmrg 1093690143ccSmrg Signed-off-by: Julien Cristau <jcristau@debian.org> 1094690143ccSmrg Reviewed-by: Dirk Wallenstein <halsmit@t-online.de> 1095690143ccSmrg 109607d2e718Smrgcommit c8375bcb7eb9f86ca1534cdf1143e91372d0499e 109707d2e718SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 109807d2e718SmrgDate: Fri Feb 11 09:06:04 2011 +1000 109907d2e718Smrg 110007d2e718Smrg xkbcomp 1.2.1 110107d2e718Smrg 110207d2e718Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 110307d2e718Smrg 110407d2e718Smrgcommit ab5371cefe2b7438b74338f71ff890e0e868b3df 110507d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 110607d2e718SmrgDate: Wed Jan 19 10:06:56 2011 -0500 110707d2e718Smrg 110807d2e718Smrg config: move man pages into their own directory 110907d2e718Smrg 111007d2e718Smrg Use services provided by XORG_MANPAGE_SECTIONS. 111107d2e718Smrg Use standard Makefile for man pages. 111207d2e718Smrg 111307d2e718Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 111407d2e718Smrg 111507d2e718Smrgcommit 9ce8e2f42ab7695b5165ff0a3d892df96a3c3f01 111607d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 111707d2e718SmrgDate: Thu Jan 13 11:15:47 2011 -0500 111807d2e718Smrg 111907d2e718Smrg man: remove trailing spaces and tabs 112007d2e718Smrg 112107d2e718Smrg Using s/[ \t]*$// 112207d2e718Smrg 112307d2e718Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 112407d2e718Smrg 112507d2e718Smrgcommit 5ecf21cc130d7a45cb5e82e9c2c3025edee5d74f 112607d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 112707d2e718SmrgDate: Wed Jan 12 16:28:02 2011 -0500 112807d2e718Smrg 112907d2e718Smrg config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS 113007d2e718Smrg 113107d2e718Smrg This silences an Autoconf warning 113207d2e718Smrg 113307d2e718Smrgcommit e27e8c2a15ddcf51b2ea58f8eced7f035aa1301e 113407d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 113507d2e718SmrgDate: Wed Jan 12 15:29:50 2011 -0500 113607d2e718Smrg 113707d2e718Smrg config: replace deprecated AC_HELP_STRING with AS_HELP_STRING 113807d2e718Smrg 113907d2e718Smrg This silences an Automake warning. 114007d2e718Smrg 114107d2e718Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 114207d2e718Smrg 114307d2e718Smrgcommit f524cfae6951442c9a9da65ef317b9c04199500f 114407d2e718SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 114507d2e718SmrgDate: Tue Jan 4 00:05:18 2011 -0800 114607d2e718Smrg 114707d2e718Smrg Remove out-of-date copies of README.config & README.enhancing 114807d2e718Smrg 114907d2e718Smrg The up-to-date master copies of those documents are found in the 115007d2e718Smrg xorg-docs module, and posted on the X.Org website. 115107d2e718Smrg 115207d2e718Smrg Also, x-docs.org no longer carries X11 docs, so point to X.Org's 115307d2e718Smrg website instead in the README. 115407d2e718Smrg 115507d2e718Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 115607d2e718Smrg Reviewed-by: Daniel Stone <daniel@fooishbar.org> 115707d2e718Smrg 115807d2e718Smrgcommit cc55d8f5ab021861308b071aab9c03016be15187 115907d2e718SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 116007d2e718SmrgDate: Sun Oct 31 20:35:24 2010 -0400 116107d2e718Smrg 116207d2e718Smrg config: replace AC_CHECK_FILE with test -f as it fails to cross-compile 116307d2e718Smrg 116407d2e718Smrg Testing for the presence of xkbparse.c is legitimate as this is a build 116507d2e718Smrg file, but the Autoconf macro assumes it is testing on the host system 116607d2e718Smrg and fails. 116707d2e718Smrg 116807d2e718Smrg Tested-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org> 116907d2e718Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 117007d2e718Smrg 117107d2e718Smrgcommit 1d59f5b0387b18028017cfab4e55b703417dd735 117207d2e718SmrgAuthor: Dirk Wallenstein <halsmit@t-online.de> 117307d2e718SmrgDate: Fri Oct 29 13:08:25 2010 +0200 117407d2e718Smrg 117507d2e718Smrg man: Improve description of device selection option 117607d2e718Smrg 117707d2e718Smrg The device selection option takes effect when loading keymaps, too. 117807d2e718Smrg 117907d2e718Smrg Signed-off-by: Dirk Wallenstein <halsmit@t-online.de> 118007d2e718Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 118107d2e718Smrg 118207d2e718Smrgcommit 281c7744f682c1ba4f44c0ee22f9bf7188c14fe6 118307d2e718SmrgAuthor: Dirk Wallenstein <halsmit@t-online.de> 118407d2e718SmrgDate: Fri Oct 29 11:35:10 2010 +0200 118507d2e718Smrg 118607d2e718Smrg Allow uploading a keymap to a single device 118707d2e718Smrg 118807d2e718Smrg Signed-off-by: Dirk Wallenstein <halsmit@t-online.de> 118907d2e718Smrg Reviewed-by: Julien Cristau <jcristau@debian.org> 119007d2e718Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 119107d2e718Smrg 119283e5f723Smrgcommit 851a5f6e0c1b2a98d4714d95e40198ab5dc61607 119383e5f723SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 119483e5f723SmrgDate: Sat Oct 30 09:59:52 2010 -0700 119583e5f723Smrg 119683e5f723Smrg xkbcomp 1.2.0 119783e5f723Smrg 119883e5f723Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 119983e5f723Smrg 120083e5f723Smrgcommit 87576c9ebf0f28d66833bb28a8199df1aa01f693 120183e5f723SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 120283e5f723SmrgDate: Thu Sep 23 20:29:57 2010 -0700 120383e5f723Smrg 120483e5f723Smrg config: Remove unnecessary calls from configure.ac 120583e5f723Smrg 120683e5f723Smrg AC_PROG_CC & AC_PROG_INSTALL are provided by XORG_DEFAULT_OPTIONS now 120783e5f723Smrg PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables 120883e5f723Smrg 120983e5f723Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 121083e5f723Smrg 121183e5f723Smrgcommit d083293a4e227e9dd27f74cde391fde4c5824b0c 121283e5f723SmrgAuthor: Alan Coopersmith <alan.coopersmith@oracle.com> 121383e5f723SmrgDate: Thu Sep 23 20:29:14 2010 -0700 121483e5f723Smrg 121583e5f723Smrg config: upgrade to util-macros 1.8 for additional man page support 121683e5f723Smrg 121783e5f723Smrg Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS 121883e5f723Smrg The value of MAN_SUBST is the same for all X.Org packages. 121983e5f723Smrg 122083e5f723Smrg Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS 122183e5f723Smrg The existing statement can now be removed from the configuration file. 122283e5f723Smrg 122383e5f723Smrg Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED) 122483e5f723Smrg Enables silent rule and use platform appropriate version of sed. 122583e5f723Smrg 122683e5f723Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> 122783e5f723Smrg 122883e5f723Smrgcommit 8f13f1af68fc55b7567a4eb4462a0c911722a3c4 122983e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 123083e5f723SmrgDate: Tue Jul 20 18:45:18 2010 -0400 123183e5f723Smrg 123283e5f723Smrg config: update AC_PREREQ statement to 2.60 123383e5f723Smrg 123483e5f723Smrg Unrelated to the previous patches, the new value simply reflects 123583e5f723Smrg the reality that the minimum level for autoconf to configure 123683e5f723Smrg all x.org modules is 2.60 dated June 2006. 123783e5f723Smrg 123883e5f723Smrg ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz 123983e5f723Smrg 124083e5f723Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 124183e5f723Smrg 124283e5f723Smrgcommit 988eb0e121c0f2c992031002acb7274c2026764b 124383e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 124483e5f723SmrgDate: Mon Jul 12 10:53:34 2010 +0100 124583e5f723Smrg 124683e5f723Smrg config: allow to build tarball when yacc is missing 124783e5f723Smrg 124883e5f723Smrg Autoconf does not handle this scenario as well as Automake does. 124983e5f723Smrg If xkbparse.c is already there, do not abort the configuration 125083e5f723Smrg if yacc is missing as it is not needed. 125183e5f723Smrg 125283e5f723Smrg If both xkbparse.c and yacc are missing, abort configuration. 125383e5f723Smrg Yacc is a required tool to build the package. 125483e5f723Smrg 125583e5f723Smrg Reported-by: Julien Cristau <jcristau@debian.org> 125683e5f723Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 125783e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 125883e5f723Smrg 125983e5f723Smrgcommit 446d226f85433aeb45834b65f966397ad6fbb17f 126083e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 126183e5f723SmrgDate: Mon Jul 12 10:37:49 2010 +0100 126283e5f723Smrg 126383e5f723Smrg limits.h is mandated by C89, no need to check for it 126483e5f723Smrg 126583e5f723Smrg Alan Coopersmith pointed out that C89 mandates limits.h, so for once in 126683e5f723Smrg X's life, checking for a system header is just being unnecessarily 126783e5f723Smrg paranoid. 126883e5f723Smrg 126983e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 127083e5f723Smrg 127183e5f723Smrgcommit 61b3d4b024d8146cb0e7659aa958045ceb72c482 127283e5f723SmrgAuthor: Julien Cristau <jcristau@debian.org> 127383e5f723SmrgDate: Mon Jul 12 10:28:32 2010 +0100 127483e5f723Smrg 127583e5f723Smrg Fix signedness issue with getc() return value 127683e5f723Smrg 127783e5f723Smrg getc() and ungetc() return and take, respectively, an int rather than a 127883e5f723Smrg char to allow for error values as well. Oops. 127983e5f723Smrg 128083e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 128183e5f723Smrg 128283e5f723Smrgcommit a281386fa887e6bf4110840779aed46dd0ac89b6 128383e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 128483e5f723SmrgDate: Fri Jul 9 19:34:29 2010 +0100 128583e5f723Smrg 128683e5f723Smrg Fix parsing of 0x1a2b3c4d-style symbols 128783e5f723Smrg 128883e5f723Smrg Raw keysyms were not getting parsed correctly, due to forgetting to add 128983e5f723Smrg the code to libX11, forgetting to add the backwards-compat code for old 129083e5f723Smrg libX11s, and then stuffing the lexing up anyway. Yeesh. 129183e5f723Smrg 129283e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 129383e5f723Smrg 129483e5f723Smrgcommit 0b04ecbb7a6afb223c91d3b15baab0bc48542281 129583e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 129683e5f723SmrgDate: Tue Jun 15 19:26:19 2010 +0100 129783e5f723Smrg 129883e5f723Smrg Fix gcc warnings 129983e5f723Smrg 130083e5f723Smrg It was right too: printf was being misused in some spots. 130183e5f723Smrg 130283e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 130383e5f723Smrg 130483e5f723Smrgcommit 41b0857c8c1179b87a26888588cbfff28f8bb0d6 130583e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 130683e5f723SmrgDate: Tue Jun 8 15:11:19 2010 +0100 130783e5f723Smrg 130883e5f723Smrg Don't malloc() and free() most scanned symbols 130983e5f723Smrg 131083e5f723Smrg Use a constant buffer. Sigh. 131183e5f723Smrg 131283e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 131383e5f723Smrg 131483e5f723Smrgcommit 7f7a57c75beb5e1dfb53351e490ef00a324b2727 131583e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 131683e5f723SmrgDate: Tue Jun 8 12:14:00 2010 +0100 131783e5f723Smrg 131883e5f723Smrg Fix compilation with DEBUG 131983e5f723Smrg 132083e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 132183e5f723Smrg 132283e5f723Smrgcommit 9887842e33174a6e98675b912e419c711dd20c0f 132383e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 132483e5f723SmrgDate: Mon Jun 7 22:45:13 2010 +0100 132583e5f723Smrg 132683e5f723Smrg Use fread() instead of getc() 132783e5f723Smrg 132883e5f723Smrg So, it turns out that if you're parsing a fairly large amount of data, 132983e5f723Smrg using getc() to get all the input rather than, say, read(), is some kind 133083e5f723Smrg of remarkably daft and unperformant idea. 133183e5f723Smrg 133283e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 133383e5f723Smrg 133483e5f723Smrgcommit 02de53d767b20bab1517b4e8a3e7eb3b9e7f15be 133583e5f723SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 133683e5f723SmrgDate: Mon Jun 7 22:43:01 2010 +0100 133783e5f723Smrg 133883e5f723Smrg Lazy keysym parsing (avoid XStringToKeysym) 133983e5f723Smrg 134083e5f723Smrg Instead of calling XStringToKeysym on every keysym we parse, store it as 134183e5f723Smrg a string until we need to store it in an actual keymap. 134283e5f723Smrg 134383e5f723Smrg Signed-off-by: Daniel Stone <daniel@fooishbar.org> 134483e5f723Smrg 134583e5f723Smrgcommit 07cc4d60dea2b4c947fed45b082edae4a53b186a 134683e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 134783e5f723SmrgDate: Wed Jun 2 15:23:58 2010 -0400 134883e5f723Smrg 134983e5f723Smrg config: add check for yacc to insure it is installed #27973 135083e5f723Smrg 135183e5f723Smrg Unlike other macros AC_PROG_YACC sets the YACC variable to "yacc" 135283e5f723Smrg as a last resort, even if no programs have been found. Improve error 135383e5f723Smrg checking by issuing an error message if yacc is not found. The module 135483e5f723Smrg cannot build anyway. 135583e5f723Smrg 135683e5f723Smrg Reported-by: Peter Hutterer <peter.hutterer@who-t.net> 135783e5f723Smrg Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 135883e5f723Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 135983e5f723Smrg 136083e5f723Smrgcommit 7888738047e9f1545aa1905b4a2a0654686f49a8 136183e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 136283e5f723SmrgDate: Thu Feb 11 10:08:07 2010 -0500 136383e5f723Smrg 136483e5f723Smrg config: move CWARNFLAGS from configure.ac to Makefile.am 136583e5f723Smrg 136683e5f723Smrg Compiler warning flags should be explicitly set in the makefile 136783e5f723Smrg rather than being merged with other packages compiler flags. 136883e5f723Smrg 136983e5f723Smrg Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 137083e5f723Smrg 137183e5f723Smrgcommit ba906359da32644b40b3a8a71e77d3cabca56efe 137283e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 137383e5f723SmrgDate: Thu Nov 26 09:19:54 2009 -0500 137483e5f723Smrg 137583e5f723Smrg Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES 137683e5f723Smrg 137783e5f723Smrg Now that the INSTALL file is generated. 137883e5f723Smrg Allows running make maintainer-clean. 137983e5f723Smrg 138083e5f723Smrgcommit 667f0a0e5d3143533cbbe5979ef82c13cfa62c3a 138183e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 138283e5f723SmrgDate: Wed Oct 28 14:09:08 2009 -0400 138383e5f723Smrg 138483e5f723Smrg INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 138583e5f723Smrg 138683e5f723Smrg Add missing INSTALL file. Use standard GNU file on building tarball 138783e5f723Smrg README may have been updated 138883e5f723Smrg Remove AUTHORS file as it is empty and no content available yet. 138983e5f723Smrg Remove NEWS file as it is empty and no content available yet. 139083e5f723Smrg 139183e5f723Smrgcommit 4b7c8a8ef337614c831b2555afeb6d89dbc14fb1 139283e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 139383e5f723SmrgDate: Tue Oct 27 15:07:25 2009 -0400 139483e5f723Smrg 139583e5f723Smrg Deploy the new XORG_DEFAULT_OPTIONS #24242 139683e5f723Smrg 139783e5f723Smrg This macro aggregate a number of existing macros that sets commmon 139883e5f723Smrg X.Org components configuration options. It shields the configuration file from 139983e5f723Smrg future changes. 140083e5f723Smrg 140183e5f723Smrgcommit 5fa9ef7e5e87f875dd92cc33403cebf6c60c557f 140283e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 140383e5f723SmrgDate: Mon Oct 26 22:08:39 2009 -0400 140483e5f723Smrg 140583e5f723Smrg Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 140683e5f723Smrg 140783e5f723Smrg ChangeLog filename is known to Automake and requires no further 140883e5f723Smrg coding in the makefile. 140983e5f723Smrg 141083e5f723Smrgcommit b3a52787e0dad42ea7e8da26926b9533b1ecab84 141183e5f723SmrgAuthor: Gaetan Nadon <memsize@videotron.ca> 141283e5f723SmrgDate: Thu Oct 22 12:34:15 2009 -0400 141383e5f723Smrg 141483e5f723Smrg .gitignore: use common defaults with custom section # 24239 141583e5f723Smrg 141683e5f723Smrg Using common defaults will reduce errors and maintenance. 141783e5f723Smrg Only the very small or inexistent custom section need periodic maintenance 141883e5f723Smrg when the structure of the component changes. Do not edit defaults. 141983e5f723Smrg 142083e5f723Smrgcommit fa7e3ff7b49f76294aa14aa8bf1b8adbceb5d340 142183e5f723SmrgAuthor: Jeremy Huddleston <jeremyhu@freedesktop.org> 142283e5f723SmrgDate: Wed Oct 21 12:47:21 2009 -0700 142383e5f723Smrg 142483e5f723Smrg This is not a GNU project, so declare it foreign. 142583e5f723Smrg 142683e5f723Smrg On Wed, 2009-10-21 at 13:36 +1000, Peter Hutterer wrote: 142783e5f723Smrg > On Tue, Oct 20, 2009 at 08:23:55PM -0700, Jeremy Huddleston wrote: 142883e5f723Smrg > > I noticed an INSTALL file in xlsclients and libXvMC today, and it 142983e5f723Smrg > > was quite annoying to work around since 'autoreconf -fvi' replaces 143083e5f723Smrg > > it and git wants to commit it. Should these files even be in git? 143183e5f723Smrg > > Can I nuke them for the betterment of humanity and since they get 143283e5f723Smrg > > created by autoreconf anyways? 143383e5f723Smrg > 143483e5f723Smrg > See https://bugs.freedesktop.org/show_bug.cgi?id=24206 143583e5f723Smrg 143683e5f723Smrg As an interim measure, replace AM_INIT_AUTOMAKE([dist-bzip2]) with 143783e5f723Smrg AM_INIT_AUTOMAKE([foreign dist-bzip2]). This will prevent the generation 143883e5f723Smrg of the INSTALL file. It is also part of the 24206 solution. 143983e5f723Smrg 144083e5f723Smrg Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> 144183e5f723Smrg 14425fac8b10Smrgcommit a5160032d7e46473b8702b87a546071fc0c0978c 14435fac8b10SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 14445fac8b10SmrgDate: Sat Oct 3 21:12:47 2009 +1000 14455fac8b10Smrg 14465fac8b10Smrg xkbcomp 1.1.1 14475fac8b10Smrg 14485fac8b10Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 14495fac8b10Smrg 14505fac8b10Smrgcommit a36ca5ba61e2b97398a79713922644fee1a263d1 14515fac8b10SmrgAuthor: Rami Ylimaki <ext-rami.ylimaki@nokia.com> 14525fac8b10SmrgDate: Wed Aug 5 17:16:16 2009 +0300 14535fac8b10Smrg 14545fac8b10Smrg xkbcomp: Remove output file if closing fails. 14555fac8b10Smrg 14565fac8b10Smrg Without the fix xkbcomp may leave a truncated file in the filesystem 14575fac8b10Smrg if there is not enough disk space. Using the truncated file leads to 14585fac8b10Smrg problems. 14595fac8b10Smrg 14605fac8b10Smrg Signed-off-by: Rami Ylimaki <ext-rami.ylimaki@nokia.com> 14615fac8b10Smrg Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 14625fac8b10Smrg 146334345a63Smrgcommit 2cc1dc9a327a5100043d3d54e899b98b81cdf5f5 146434345a63SmrgAuthor: Peter Hutterer <peter.hutterer@who-t.net> 146534345a63SmrgDate: Thu Jul 9 08:34:21 2009 +1000 146634345a63Smrg 146734345a63Smrg Bump to 1.1.0. 146834345a63Smrg 146934345a63Smrgcommit eeaa4aec798ef045d0b3b9de3c25932b85b9ac3d 147034345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 147134345a63SmrgDate: Mon May 11 09:39:03 2009 -0700 147234345a63Smrg 147334345a63Smrg Use temporary buffer for generating Uxxx names to avoid overflow 147434345a63Smrg 147534345a63Smrg Instead of sprintf()'ing a 4 character string to a char [4] buffer, 147634345a63Smrg and leaving the trailing '\0' to overwrite into the next entry, 147734345a63Smrg snprintf() to a 5 character temp buffer and memcpy the 4 characters 147834345a63Smrg to the right place. 147934345a63Smrg 148034345a63Smrg Fixes parfait errors: 148134345a63Smrg Error: Buffer overflow at xkbcomp-1.0.4/misc.c:393 148234345a63Smrg in function 'ComputeKbdDefaults' [Standard C Library pattern matching] 148334345a63Smrg In sprintf related dereference of xkb->names->keys[i].name 148434345a63Smrg with index not less than '4' 148534345a63Smrg Destination array size is 4 bytes, data to be written is 4 bytes 148634345a63Smrg Error: Buffer overflow at xkbcomp-1.0.4/misc.c:402 148734345a63Smrg in function 'ComputeKbdDefaults' [Standard C Library pattern matching] 148834345a63Smrg In sprintf related dereference of xkb->names->keys[i].name 148934345a63Smrg with index not less than '4' 149034345a63Smrg Destination array size is 4 bytes, data to be written is 4 bytes 149134345a63Smrg 149234345a63Smrg [This bug was found by the Parfait bug checking tool. 149334345a63Smrg For more information see http://research.sun.com/projects/parfait ] 149434345a63Smrg 149534345a63Smrg Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> 149634345a63Smrg 149734345a63Smrgcommit 2fd42dae8840089727f95211abdb86316e566afd 149834345a63SmrgAuthor: Dan Nicholson <dbn.lists@gmail.com> 149934345a63SmrgDate: Sat Mar 7 16:36:51 2009 -0800 150034345a63Smrg 150134345a63Smrg Allow the default XKB config root to be set from configure 150234345a63Smrg 150334345a63Smrg The default was hardcoded in the Makefile as $(datadir)/share/X11/xkb. 150434345a63Smrg This could cause a problem if you are installing xkbcomp to an alternate 150534345a63Smrg location but want to continue using the system's XKB data. 150634345a63Smrg 150734345a63Smrg Signed-off-by: Dan Nicholson <dbn.lists@gmail.com> 150834345a63Smrg 150934345a63Smrgcommit 3b816fe819bd849acdbabcfba769041bd3eab753 151034345a63SmrgAuthor: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> 151134345a63SmrgDate: Thu Jan 22 02:45:20 2009 -0200 151234345a63Smrg 151334345a63Smrg Correct a remaining of a wrong change to make some DEBUG_VAR's static. 151434345a63Smrg 151534345a63Smrgcommit f099da35386cf63d4935ba2613409ff28b3d7ea5 151634345a63SmrgAuthor: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br> 151734345a63SmrgDate: Wed Jan 21 20:43:28 2009 -0200 151834345a63Smrg 151934345a63Smrg Correct make distcheck and most gcc and sparse warnings. 152034345a63Smrg 152134345a63Smrg Remaining warnings are due to macros that check address or vectors 152234345a63Smrg on the stack and auto generated yacc code. 152334345a63Smrg 152434345a63Smrg Compiled with default flags and also as: 152534345a63Smrg % make CFLAGS=-DENTRY_TRACKING_ON -DDEBUG_ON -DASSERTIONS_ON 152634345a63Smrg to ensure the "simplification" of code like: 152734345a63Smrg foo.c: 152834345a63Smrg <hash>define DEBUG_VAR foo_VAR 152934345a63Smrg <hash>include "foo.h" 153034345a63Smrg ... 153134345a63Smrg foo.h: 153234345a63Smrg <hash>ifdef DEBUG_VAR_NOT_LOCAL 153334345a63Smrg extern 153434345a63Smrg <hash>endif 153534345a63Smrg int DEBUG_VAR; 153634345a63Smrg ... 153734345a63Smrg did not change the author's "intended" logic. 153834345a63Smrg 153934345a63Smrgcommit 82cebb165b22d5409c9d4d31554a8da0c867e0d3 154034345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 154134345a63SmrgDate: Wed Sep 10 17:48:29 2008 +0930 154234345a63Smrg 154334345a63Smrg Check for NULL strings before calling strdup. 154434345a63Smrg 154534345a63Smrg Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> 154634345a63Smrg 154734345a63Smrgcommit a82e1dcc8ad095581402d05e5d1ae1bbf3646954 154834345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 154934345a63SmrgDate: Fri Sep 5 15:07:13 2008 -0700 155034345a63Smrg 155134345a63Smrg sprintf -> snprintf conversions 155234345a63Smrg 155334345a63Smrgcommit d2d06305e1834548edd8a647564efa222a511b53 155434345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 155534345a63SmrgDate: Fri Sep 5 14:44:51 2008 -0700 155634345a63Smrg 155734345a63Smrg Remove #if 0'd typedef that appears nowhere else. 155834345a63Smrg 155934345a63Smrgcommit acd277d7fd48ccfd8ef2ca052b4e144ee95a5d94 156034345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 156134345a63SmrgDate: Fri Sep 5 14:32:15 2008 -0700 156234345a63Smrg 156334345a63Smrg Remove X_NOT_POSIX #ifdefs 156434345a63Smrg 156534345a63Smrg POSIX.1-1990 is well below the current minimum bar 156634345a63Smrg 156734345a63Smrgcommit 37b62a26716d3abf2ae07dd88cf54bc04d980bd8 156834345a63SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 156934345a63SmrgDate: Fri Sep 5 14:22:33 2008 -0700 157034345a63Smrg 157134345a63Smrg Check for strdup & strcasecmp before assuming we need to provide our own 157234345a63Smrg 157334345a63Smrgcommit 36fecff588199a3a6c007f09ff709f3148d40f77 157434345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 157534345a63SmrgDate: Tue Aug 19 16:33:03 2008 +0930 157634345a63Smrg 157734345a63Smrg Don't overwrite previously assigned type indices with useless ones. 157834345a63Smrg 157934345a63Smrg The default type for a key with no levels is ONE_LEVEL. 158034345a63Smrg Let's not overwrite the kt_index with this default type if we have previously 158134345a63Smrg assigned a real type. 158234345a63Smrg 158334345a63Smrg Reproduceable by running setxkbmap -layout "ru(phonetic),us", the first group 158434345a63Smrg is assigned ONE_LEVEL and shift stops working. 158534345a63Smrg 158634345a63Smrg Red Hat Bug #436626 <https://bugzilla.redhat.com/show_bug.cgi?id=436626> 158734345a63Smrg 158834345a63Smrgcommit d0dfd26e81aef53e9adf5fd6372d69e2ac7a8f9c 158934345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 159034345a63SmrgDate: Tue Aug 19 14:36:13 2008 +0930 159134345a63Smrg 159234345a63Smrg Remove unused merge parameter from HandleKeyNameVar. 159334345a63Smrg 159434345a63Smrgcommit 391ea45b2cadc7faeb6acb5d9ec7b405d67d46fd 159534345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 159634345a63SmrgDate: Tue Aug 19 14:35:39 2008 +0930 159734345a63Smrg 159834345a63Smrg Don't pass useless handlers around in HandleIncludeKeycodes. 159934345a63Smrg 160034345a63Smrg What use is a handler if we only ever use one function anyway? 160134345a63Smrg 160234345a63Smrgcommit f05f20fd203afdadbcd571023ed31638ccda1f88 160334345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 160434345a63SmrgDate: Thu Aug 21 17:28:22 2008 +0930 160534345a63Smrg 160634345a63Smrg More comments. 160734345a63Smrg 160834345a63Smrgcommit 1aad2a5d8ede9fe5212a4e6087fbe34aa170ac54 160934345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 161034345a63SmrgDate: Mon Aug 18 16:28:44 2008 +0930 161134345a63Smrg 161234345a63Smrg Remove useless longestPath variable. 161334345a63Smrg 161434345a63Smrgcommit 7aef93914e1d6446f64aa42eafa18375c2cb4bed 161534345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 161634345a63SmrgDate: Mon Aug 18 14:05:33 2008 +0930 161734345a63Smrg 161834345a63Smrg Silence valgrind warnings. 161934345a63Smrg 162034345a63Smrg "Conditional jump or move depends on uninitialised value(s)" 162134345a63Smrg 162234345a63Smrgcommit eb18e9176841b3ea64c497f1919686e134713eb6 162334345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 162434345a63SmrgDate: Mon Aug 11 18:01:48 2008 +0930 162534345a63Smrg 162634345a63Smrg Add some explanatory comments 162734345a63Smrg 162834345a63Smrgcommit 9b877d83947708259252275e14f6995dcf7c29ce 162934345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 163034345a63SmrgDate: Mon Aug 11 16:20:22 2008 +0930 163134345a63Smrg 163234345a63Smrg If we're not using XkbDesc, don't require it as a parameter. 163334345a63Smrg 163434345a63Smrgcommit ca32570cf16494fb8e0577de8b05ba18cb927ce1 163534345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 163634345a63SmrgDate: Mon Aug 11 15:47:09 2008 +0930 163734345a63Smrg 163834345a63Smrg Indent fixes. 163934345a63Smrg 164034345a63Smrg indent -cbi 0 -nprs -nut -npcs -i4 -bli 0 *.c *.h 164134345a63Smrg 164234345a63Smrgcommit 12e8f5e5b3f33dbd1290c76dd0d6a4cf832993d7 164334345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 164434345a63SmrgDate: Mon Aug 11 15:40:03 2008 +0930 164534345a63Smrg 164634345a63Smrg Add a few explanatory comments. 164734345a63Smrg 164834345a63Smrgcommit de48206e7fe2206542313a2d1d1ea3c40b06114b 164934345a63SmrgAuthor: Peter Hutterer <peter.hutterer@redhat.com> 165034345a63SmrgDate: Mon Aug 11 15:14:31 2008 +0930 165134345a63Smrg 165234345a63Smrg Remove RCS tags. 165334345a63Smrg 165434345a63Smrgcommit 8eb2e1fcd08a05f296a31dbadde1ec3cc84d8e28 165534345a63SmrgAuthor: Matthieu Herrb <matthieu.herrb@laas.fr> 165634345a63SmrgDate: Mon May 12 23:25:47 2008 +0200 165734345a63Smrg 165834345a63Smrg Minimal man page addition for new -i option. 165934345a63Smrg 166034345a63Smrgcommit 12df85eb5b08d5fb815b0965714f120b05c6c670 166134345a63SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 166234345a63SmrgDate: Fri May 9 21:09:44 2008 +0300 166334345a63Smrg 166434345a63Smrg Bump to 1.0.5 166534345a63Smrg 1666f46a6179Smrgcommit 1aecdffaa0db7bbf85bc0aae9043e9437b25c30d 1667f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1668f46a6179SmrgDate: Thu Apr 17 00:52:29 2008 +0300 1669f46a6179Smrg 1670f46a6179Smrg Don't scan paths which make NO SENSE WHATSOEVER TO SCAN 1671f46a6179Smrg 1672f46a6179Smrg Hey, I wonder if we have XKB files in our directory! I wonder if we 1673f46a6179Smrg haven't bothered with a structure, and let's try to open a file called 1674f46a6179Smrg 'misc' in someone's home directory! What a surprise, it's not a valid 1675f46a6179Smrg XKB file! Let's fail miserably! 1676f46a6179Smrg 1677f46a6179Smrg SURPRISINGLY, THIS IS NOT USEFUL BEHAVIOUR. 1678f46a6179Smrg 1679f46a6179Smrgcommit a3a05fd489a9a35942a4419c537634e796dbebd1 1680f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1681f46a6179SmrgDate: Thu Apr 17 00:50:07 2008 +0300 1682f46a6179Smrg 1683f46a6179Smrg xkbcomp: Take a device ID argument 1684f46a6179Smrg 1685f46a6179Smrg Allows the user to set maps (or whatever) on arbitrary devices. 1686f46a6179Smrg 1687f46a6179Smrgcommit be084fbeba28312fc5102e98d64726464032c3e8 1688f46a6179SmrgAuthor: Adam Jackson <ajax@redhat.com> 1689f46a6179SmrgDate: Thu Mar 6 17:13:42 2008 -0500 1690f46a6179Smrg 1691f46a6179Smrg xkbcomp 1.0.4 1692f46a6179Smrg 1693f46a6179Smrgcommit c1cc023fc50ce3a4a23f4682ebefd2301fd13170 1694f46a6179SmrgAuthor: Adam Jackson <ajax@redhat.com> 1695f46a6179SmrgDate: Fri Feb 29 15:30:34 2008 -0500 1696f46a6179Smrg 1697f46a6179Smrg Bug #7645: Fix a conditional that always evaluates to FALSE. 1698f46a6179Smrg 1699f46a6179Smrg Since it's if (0 || foo), simplify to if (foo). 1700f46a6179Smrg 1701f46a6179Smrgcommit 3f8bd7e68d0028bce5075124a32cc004166486c6 1702f46a6179SmrgAuthor: Alan Coopersmith <alan.coopersmith@sun.com> 1703f46a6179SmrgDate: Tue Jan 22 16:05:14 2008 -0800 1704f46a6179Smrg 1705f46a6179Smrg Bug 14185: MAINTAINERCLEANFILES multiply defined in Makefile.am 1706f46a6179Smrg 1707f46a6179Smrg <http://bugs.freedesktop.org/show_bug.cgi?id=14185> 1708f46a6179Smrg 1709f46a6179Smrgcommit 2421069a3686f7bff702383675fdb77be108021e 1710f46a6179SmrgAuthor: Matthieu Herrb <matthieu@bluenote.herrb.com> 1711f46a6179SmrgDate: Sun Jan 6 11:40:30 2008 +0100 1712f46a6179Smrg 1713f46a6179Smrg Revert "Also mark xkbparse.h as a generated file." 1714f46a6179Smrg Apparently only yacc generates it. 1715f46a6179Smrg 1716f46a6179Smrg This reverts commit 3e5b0d615b94c66a2b5a8b3d2e4a04713a442002. 1717f46a6179Smrg 1718f46a6179Smrgcommit 3e5b0d615b94c66a2b5a8b3d2e4a04713a442002 1719f46a6179SmrgAuthor: Matthieu Herrb <matthieu@bluenote.herrb.com> 1720f46a6179SmrgDate: Sun Jan 6 11:17:07 2008 +0100 1721f46a6179Smrg 1722f46a6179Smrg Also mark xkbparse.h as a generated file. 1723f46a6179Smrg 1724f46a6179Smrgcommit 686e8b6d33602f5fb7de7a768e532a4ac8090c26 1725f46a6179SmrgAuthor: James Cloos <cloos@jhcloos.com> 1726f46a6179SmrgDate: Thu Dec 6 16:37:18 2007 -0500 1727f46a6179Smrg 1728f46a6179Smrg Replace static ChangeLog with dist-hook to generate from git log 1729f46a6179Smrg 1730f46a6179Smrgcommit 6aae208fe5bd8f71757c294a441d7c599a1ec4a1 1731f46a6179SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1732f46a6179SmrgDate: Sun Sep 23 20:15:47 2007 +0200 1733f46a6179Smrg 1734f46a6179Smrg Ignore *.o and ylwrap. 1735f46a6179Smrg 1736f46a6179Smrgcommit 829cb75130d1edd88fa1d33e277f49167daedacf 1737f46a6179SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1738f46a6179SmrgDate: Sun Sep 23 20:15:13 2007 +0200 1739f46a6179Smrg 1740f46a6179Smrg Fixed a bunch of const correctness bugs. 1741f46a6179Smrg 1742f46a6179Smrgcommit e8ffa513a109209849b11a3c608356cc28314a8e 1743f46a6179SmrgAuthor: Tilman Sauerbeck <tilman@code-monkey.de> 1744f46a6179SmrgDate: Sun Sep 23 17:50:41 2007 +0200 1745f46a6179Smrg 1746f46a6179Smrg Fixed an invalid memory access. 1747f46a6179Smrg 1748f46a6179Smrg Some keynames are less than 3 characters long (not counting the 1749f46a6179Smrg terminator). We're now also initializing all of the keyName array. 1750f46a6179Smrg 1751f46a6179Smrgcommit dfa65b0c8df6a6aab4f86c32a0acb41f44201e7c 1752f46a6179SmrgAuthor: Daniel Drake <ddrake@brontes3d.com> 1753f46a6179SmrgDate: Mon May 21 13:41:00 2007 -0800 1754f46a6179Smrg 1755f46a6179Smrg Bug #11025: xkbcomp COPYING file 1756f46a6179Smrg 1757f46a6179Smrg X.Org Bugzilla #11025 <https://bugs.freedesktop.org/show_bug.cgi?id=11025> 1758f46a6179Smrg 1759f46a6179Smrgcommit 3ca028cf767258fd62fb7a1b0eb22d13d333a3ae 1760f46a6179SmrgAuthor: James Cloos <cloos@jhcloos.com> 1761f46a6179SmrgDate: Mon Sep 3 05:51:25 2007 -0400 1762f46a6179Smrg 1763f46a6179Smrg Add *~ to .gitignore to skip patch/emacs droppings 1764f46a6179Smrg 1765f46a6179Smrgcommit b00e474ca8dbbb0166f2108e4b08cc3f9c36c735 1766f46a6179SmrgAuthor: James Cloos <cloos@jhcloos.com> 1767f46a6179SmrgDate: Thu Aug 23 19:24:52 2007 -0400 1768f46a6179Smrg 1769f46a6179Smrg Rename .cvsignore to .gitignore 1770f46a6179Smrg 1771f46a6179Smrgcommit 313a2748d3dff872e067d515d6deabe1bbd56fbe 1772f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1773f46a6179SmrgDate: Wed Nov 8 16:30:57 2006 +0200 1774f46a6179Smrg 1775f46a6179Smrg bump to 1.0.3 1776f46a6179Smrg 1777f46a6179Smrgcommit 337ed258a1cd3f5a16fa69ef15e98781e76f63a1 1778f46a6179SmrgAuthor: Etsushi Kato <ek.kato@gmail.com> 1779f46a6179SmrgDate: Wed Nov 8 16:29:16 2006 +0200 1780f46a6179Smrg 1781f46a6179Smrg compat: avoid use of uninitialised variable (bug #8846) 1782f46a6179Smrg si.interp.match may be unused, so just clobber it, which means we don't 1783f46a6179Smrg end up with stuff like LevelOneOnlyMask wandering in. 1784f46a6179Smrg 1785f46a6179Smrgcommit d920bbadb94684287f70e50ded2a35d65186c188 1786f46a6179SmrgAuthor: Andriy Gapon <avg@icyb.net.ua> 1787f46a6179SmrgDate: Sun Oct 29 02:59:53 2006 +0300 1788f46a6179Smrg 1789f46a6179Smrg parser: accept negative numbers in geometry co-ordinates (bug #8763) 1790f46a6179Smrg Accept negative co-ordinates for geometry, per the spec. 1791f46a6179Smrg 1792f46a6179Smrgcommit 0e8fd676de161ba52bb4544f8641be756bc580a1 1793f46a6179SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1794f46a6179SmrgDate: Wed Apr 26 23:41:58 2006 +0000 1795f46a6179Smrg 1796f46a6179Smrg Bump to 1.0.2 1797f46a6179Smrg 1798f46a6179Smrgcommit 58c77c8db1bfdc739fac7b100fb813028d0449c7 1799f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1800f46a6179SmrgDate: Mon Apr 3 11:28:43 2006 +0000 1801f46a6179Smrg 1802f46a6179Smrg Bug #4851: Fix up have-no-file test. 1803f46a6179Smrg 1804f46a6179Smrgcommit 02d32f8dbc79116d33ef428d5b064009cdd6a06e 1805f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1806f46a6179SmrgDate: Wed Dec 21 02:29:51 2005 +0000 1807f46a6179Smrg 1808f46a6179Smrg Update package version for X11R7 release. 1809f46a6179Smrg 1810f46a6179Smrgcommit 836db774d1f08a050af8717c4c8501f337f36281 1811f46a6179SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1812f46a6179SmrgDate: Mon Dec 19 16:22:44 2005 +0000 1813f46a6179Smrg 1814f46a6179Smrg Stub COPYING files 1815f46a6179Smrg 1816f46a6179Smrgcommit e9f680c5654cd93d30b16bc4b626ae5b25f84e87 1817f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1818f46a6179SmrgDate: Thu Dec 15 00:24:08 2005 +0000 1819f46a6179Smrg 1820f46a6179Smrg Update package version number for final X11R7 release candidate. 1821f46a6179Smrg 1822f46a6179Smrgcommit b158f550fce661d67604f4a23d33a9f3b7bc22a1 1823f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1824f46a6179SmrgDate: Tue Dec 6 22:48:22 2005 +0000 1825f46a6179Smrg 1826f46a6179Smrg Change *man_SOURCES ==> *man_PRE to fix autotools warnings. 1827f46a6179Smrg 1828f46a6179Smrgcommit f1370c50b199c3c8b2760ebf0228d741855390d7 1829f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1830f46a6179SmrgDate: Sat Dec 3 05:49:24 2005 +0000 1831f46a6179Smrg 1832f46a6179Smrg Update package version number for X11R7 RC3 release. 1833f46a6179Smrg 1834f46a6179Smrgcommit 8eb3737f5bce19b89c80d9ab256204f0fa62529b 1835f46a6179SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 1836f46a6179SmrgDate: Mon Nov 28 22:01:43 2005 +0000 1837f46a6179Smrg 1838f46a6179Smrg Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4 1839f46a6179Smrg update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir) 1840f46a6179Smrg 1841f46a6179Smrgcommit f19c3028c34a0dba4ffb9ae19c13421e7ff0ff12 1842f46a6179SmrgAuthor: Eric Anholt <anholt@freebsd.org> 1843f46a6179SmrgDate: Mon Nov 21 10:35:01 2005 +0000 1844f46a6179Smrg 1845f46a6179Smrg Another pass at .cvsignores for apps. 1846f46a6179Smrg 1847f46a6179Smrgcommit 3ada747f1cb5400404e4b63430f7a817dbf0c4cb 1848f46a6179SmrgAuthor: Eric Anholt <anholt@freebsd.org> 1849f46a6179SmrgDate: Sun Nov 20 22:08:53 2005 +0000 1850f46a6179Smrg 1851f46a6179Smrg Add/improve .cvsignore files for apps. 1852f46a6179Smrg 1853f46a6179Smrgcommit 4eeb611f17bdc01f7a6cb4db3f0997ce5ecc6361 1854f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1855f46a6179SmrgDate: Wed Oct 19 02:47:54 2005 +0000 1856f46a6179Smrg 1857f46a6179Smrg Update package version number for RC1 release. 1858f46a6179Smrg 1859f46a6179Smrgcommit 958d09064c96cb50df6f92bfb8d4754c87451920 1860f46a6179SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 1861f46a6179SmrgDate: Mon Oct 17 23:56:23 2005 +0000 1862f46a6179Smrg 1863f46a6179Smrg Use @APP_MAN_SUFFIX@ instead of $(APP_MAN_SUFFIX) in macro substitutions to 1864f46a6179Smrg work better with BSD make 1865f46a6179Smrg 1866f46a6179Smrgcommit 950fba3262905c58891773a8795305e685dc1cb3 1867f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1868f46a6179SmrgDate: Sat Oct 15 19:32:52 2005 +0000 1869f46a6179Smrg 1870f46a6179Smrg Have generated files be cleaned by maintainer in order to pass 1871f46a6179Smrg check-tarball test. 1872f46a6179Smrg 1873f46a6179Smrgcommit a83e4bb777d6f9b1b42a7fb3ff84a5e0d7e123c7 1874f46a6179SmrgAuthor: Alan Coopersmith <Alan.Coopersmith@sun.com> 1875f46a6179SmrgDate: Fri Oct 14 00:25:46 2005 +0000 1876f46a6179Smrg 1877f46a6179Smrg Use sed to fill in variables in man page 1878f46a6179Smrg 1879f46a6179Smrgcommit 8c0d310c1acccc424dae29554a5075f9b339e95f 1880f46a6179SmrgAuthor: Kristian Høgsberg <krh@redhat.com> 1881f46a6179SmrgDate: Thu Sep 1 19:37:02 2005 +0000 1882f46a6179Smrg 1883f46a6179Smrg Define DFLT_XKB_CONFIG_ROOT to $(datadir)/X11/xkb so we look in the right 1884f46a6179Smrg place. 1885f46a6179Smrg 1886f46a6179Smrgcommit fabda6a820bdccae85a7c22ad0b30f089952606b 1887f46a6179SmrgAuthor: Keith Packard <keithp@keithp.com> 1888f46a6179SmrgDate: Tue Aug 2 18:03:01 2005 +0000 1889f46a6179Smrg 1890f46a6179Smrg Mark generated files as BUILT_SOURCES and CLEANFILES to ensure they are 1891f46a6179Smrg regenerated after 'make clean' and to make parallel builds work right. 1892f46a6179Smrg 1893f46a6179Smrgcommit 35e0b7ef41ffe1f17ad8f21dbda10267961231ea 1894f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1895f46a6179SmrgDate: Fri Jul 29 21:22:35 2005 +0000 1896f46a6179Smrg 1897f46a6179Smrg Various changes preparing packages for RC0: 1898f46a6179Smrg - Verify and update package version numbers as needed 1899f46a6179Smrg - Implement versioning scheme 1900f46a6179Smrg - Change bug address to point to bugzilla bug entry form 1901f46a6179Smrg - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to 1902f46a6179Smrg reenable it) 1903f46a6179Smrg - Fix makedepend to use pkgconfig and pass distcheck 1904f46a6179Smrg - Update build script to build macros first 1905f46a6179Smrg - Update modular Xorg version 1906f46a6179Smrg 1907f46a6179Smrgcommit e447fee50a8014b5281a5abfcc5e468f8cc130ca 1908f46a6179SmrgAuthor: Daniel Stone <daniel@fooishbar.org> 1909f46a6179SmrgDate: Fri Jul 22 15:08:19 2005 +0000 1910f46a6179Smrg 1911f46a6179Smrg Use YACC to compile xkbparse.y. 1912f46a6179Smrg 1913f46a6179Smrgcommit 34cd161f5947b4dc185356bc65653717f56ced00 1914f46a6179SmrgAuthor: Adam Jackson <ajax@nwnk.net> 1915f46a6179SmrgDate: Wed Jul 20 19:31:57 2005 +0000 1916f46a6179Smrg 1917f46a6179Smrg Use a unique token for PKG_CHECK_MODULES. Otherwise, if you use a global 1918f46a6179Smrg configure cache, you cache it, and the cached value is probably wrong. 1919f46a6179Smrg 1920f46a6179Smrgcommit 8335e5fa471e25675c6a369ec2348883953fcdd0 1921f46a6179SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 1922f46a6179SmrgDate: Sat Jul 16 20:56:47 2005 +0000 1923f46a6179Smrg 1924f46a6179Smrg Add xkbcomp data to symlink.sh. Some fixes to xkbcomp/Makefile.am 1925f46a6179Smrg 1926f46a6179Smrgcommit d7b3354575f31caa9044b6c5f7aee4f010f6192a 1927f46a6179SmrgAuthor: Søren Sandmann Pedersen <sandmann@daimi.au.dk> 1928f46a6179SmrgDate: Fri Jul 15 18:02:35 2005 +0000 1929f46a6179Smrg 1930f46a6179Smrg Build system for xkbcomp 1931f46a6179Smrg 1932f46a6179Smrgcommit 59e48918e7c252926bb5e51a077bcbc8a7eec829 1933f46a6179SmrgAuthor: Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> 1934f46a6179SmrgDate: Mon Nov 15 15:06:52 2004 +0000 1935f46a6179Smrg 1936f46a6179Smrg Bufzilla #1802, http://freedesktop.org/bugzilla/show_bug.cgi?id=1802 Added 1937f46a6179Smrg mingw (Win32) port 1938f46a6179Smrg 1939f46a6179Smrgcommit 0336e043fab6f2a8828d90bc9eef2e23878f6dd1 1940f46a6179SmrgAuthor: Kevin E Martin <kem@kem.org> 1941f46a6179SmrgDate: Fri Sep 3 23:41:22 2004 +0000 1942f46a6179Smrg 1943f46a6179Smrg Update formatted docs. 1944f46a6179Smrg 1945f46a6179Smrgcommit 20240438ef9d3a6c66443ca9f095a2766ef6ed4e 1946f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 1947f46a6179SmrgDate: Fri Apr 23 19:54:50 2004 +0000 1948f46a6179Smrg 1949f46a6179Smrg Merging XORG-CURRENT into trunk 1950f46a6179Smrg 1951f46a6179Smrgcommit a3729a9f9fcda07b233f434266148c8751684347 1952f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 1953f46a6179SmrgDate: Sun Mar 14 08:35:25 2004 +0000 1954f46a6179Smrg 1955f46a6179Smrg Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004 1956f46a6179Smrg 1957f46a6179Smrgcommit 37a1152a4024fb799fe1272ce378e6c7c97ee951 1958f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 1959f46a6179SmrgDate: Wed Mar 3 12:13:08 2004 +0000 1960f46a6179Smrg 1961f46a6179Smrg Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004 1962f46a6179Smrg 1963f46a6179Smrgcommit 55f40d0286d0e2e4b1602f983b749352188c3ec4 1964f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 1965f46a6179SmrgDate: Thu Feb 26 13:36:25 2004 +0000 1966f46a6179Smrg 1967f46a6179Smrg readding XFree86's cvs IDs 1968f46a6179Smrg 1969f46a6179Smrgcommit 2a95cda1d358fc309c78dc5201a1dbacaba9d0bf 1970f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 1971f46a6179SmrgDate: Thu Feb 26 09:24:08 2004 +0000 1972f46a6179Smrg 1973f46a6179Smrg Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004 1974f46a6179Smrg 1975f46a6179Smrgcommit dbba2cffbc57e5bbdec8f24417a8a5dcfef7c2a2 1976f46a6179SmrgAuthor: Egbert Eich <eich@suse.de> 1977f46a6179SmrgDate: Thu Jan 29 08:09:12 2004 +0000 1978f46a6179Smrg 1979f46a6179Smrg Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004 1980f46a6179Smrg 1981f46a6179Smrgcommit 8aa5bcfe58d3776746d7b0d627f2fb8744fb0817 1982f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 1983f46a6179SmrgDate: Fri Dec 19 20:55:58 2003 +0000 1984f46a6179Smrg 1985f46a6179Smrg XFree86 4.3.99.902 (RC 2) 1986f46a6179Smrg 1987f46a6179Smrgcommit 37ebbbe7b11febaf548006a9b73db0eebf79881a 1988f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 1989f46a6179SmrgDate: Tue Nov 25 19:29:13 2003 +0000 1990f46a6179Smrg 1991f46a6179Smrg XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks 1992f46a6179Smrg 1993f46a6179Smrgcommit 287ac4c6af61d8f9f95cd3b3219c979e1329a2fe 1994f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 1995f46a6179SmrgDate: Fri Nov 14 16:49:22 2003 +0000 1996f46a6179Smrg 1997f46a6179Smrg XFree86 4.3.0.1 1998f46a6179Smrg 1999f46a6179Smrgcommit 262961d88faf67f69f4630acb8234a4f2c5a6e80 2000f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 2001f46a6179SmrgDate: Fri Nov 14 16:49:22 2003 +0000 2002f46a6179Smrg 2003f46a6179Smrg Initial revision 2004f46a6179Smrg 2005f46a6179Smrgcommit 2af3aabf0e7eb1514d39b29a6b58fcd0d4de41d1 2006f46a6179SmrgAuthor: Kaleb Keithley <kaleb@freedesktop.org> 2007f46a6179SmrgDate: Fri Nov 14 15:54:54 2003 +0000 2008f46a6179Smrg 2009f46a6179Smrg R6.6 is the Xorg base-line 2010