frame

Merge lp:~jpakkane/frame/c1x-fixes into lp:frame

  1. c1x-fixes
  2. Merge into trunk
Proposed by Jussi Pakkanen
Status: Merged
Merged at revision: 80
Proposed branch: lp:~jpakkane/frame/c1x-fixes
Merge into: lp:frame
Diff against target: 34 lines (+6/-6)
2 files modified
configure.ac (+1/-1)
include/utouch/frame.h (+5/-5)
To merge this branch: bzr merge lp:~jpakkane/frame/c1x-fixes
Reviewer Review Type Date Requested Status
Stephen M. Webb (community) Approve
Chase Douglas (community) Needs Fixing
Review via email: mp+103114@code.launchpad.net

Description of the change

Two minor fixes. First only try to use Generics when the current standards version supports it. Secondly add a check for xorg-server package to configure.

To post a comment you must log in.
Revision history for this message
Chase Douglas (chasedouglas) wrote :

We don't need the 1.11.4 version of the X server in particular. I suggest adding a dependency without the version. Also, our xserver package has a bug where it reports itself as 1.11.3, so this will cause build failures.

review: Needs Fixing
Revision history for this message
Stephen M. Webb (bregma) wrote :

When I changed the versioned xorg-server dependency to 1.11.3, the change did indeed seem to fix the described probelms, so I'm giving an approval conditional on removing the required version in that dependency (as in Chase's Needs Fixing comment).

review: Approve
lp:~jpakkane/frame/c1x-fixes updated
81. By Jussi Pakkanen

Do not depend on a specific version of xorg-server.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2012-03-31 02:31:54 +0000
3+++ configure.ac 2012-04-24 07:18:18 +0000
4@@ -28,7 +28,7 @@
5 PKG_CHECK_MODULES([MTDEV], [mtdev >= 1.1])
6 PKG_CHECK_MODULES([EVEMU], [utouch-evemu >= 1.0.5])
7
8-PKG_CHECK_MODULES(XINPUT, x11 xext [xi >= 1.5.99.1] [inputproto >= 2.1.99.6],
9+PKG_CHECK_MODULES(XINPUT, x11 xext xorg-server [xi >= 1.5.99.1] [inputproto >= 2.1.99.6],
10 HAVE_XI22="yes"; AC_DEFINE(HAVE_XI22, 1, [XI22 available]),
11 HAVE_XI22="no")
12 AM_CONDITIONAL([HAVE_XI22], [test "$HAVE_XI22" = "yes"])
13
14=== modified file 'include/utouch/frame.h'
15--- include/utouch/frame.h 2012-03-25 22:07:41 +0000
16+++ include/utouch/frame.h 2012-04-24 07:18:18 +0000
17@@ -45,12 +45,12 @@
18 #endif
19 #endif
20
21-/* Clang provides __has_extension, but GCC does not */
22-#ifdef __has_extension
23-#if __has_extension(c_generic_selections)
24+/* Clang provides __has_feature, but GCC does not */
25+#ifdef __has_feature
26+#if __has_feature(c_generic_selections)
27 #define HAS_C_GENERIC_SELECTIONS
28-#endif // __has_extension
29-#endif // __has_extension(c_generic_selections)
30+#endif // __has_feature
31+#endif // __has_feature(c_generic_selections)
32
33 #ifdef __cplusplus
34 extern "C" {

Subscribers

People subscribed via source and target branches