← Back to branch summary

~unity-team/qtmir/miral-qt-integration

« back to all changes in this revision

Viewing changes to debian/gles-patches/convert-to-gles.patch

  • Committer: Daniel d'Andrada
  • Date: 2016-12-01 11:45:31 UTC
  • mfrom: (569.3.5 qtmir)
  • Revision ID: daniel.dandrada@canonical.com-20161201114531-3sy3ofrqft7yzr0v
Merge trunk

[ Albert Astals Cid ]
* Build with Qt 5.7 (LP: #1642608, #1642954)
[ Gerry Boland ]
* Fix FTBFS due to new googletest framework release (1.8)
* Revert Lttng test-crash workaround from rev 557
[ Jonas G. Drange ]
* relax auth of clients to allow USS to set base mir display config

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/gles-patches/convert-to-gles.patch
115
115
===================================================================
116
116
--- inline-gles-quilt.orig/debian/rules
117
117
+++ inline-gles-quilt/debian/rules
118
 
@@ -3,60 +3,28 @@
 
118
@@ -3,66 +3,31 @@
119
119
 
120
120
 export DPKG_GENSYMBOLS_CHECK_LEVEL=4
121
121
 
172
172
 override_dh_install:
173
173
-ifeq ($(DEB_HOST_ARCH),$(USES_GLES2))
174
174
+       cat $(CURDIR)/debian/qtmir-tests.install $(CURDIR)/debian/qtdeclarative5-qtmir-plugin.install | xargs -I% sh -c "rm -rf $(TMP1_DIR)/%"
 
175
        #clean gmock/gtest if it built in our build dir
 
176
        -rm -f $(TMP1_DIR)/usr/lib/libgmock*.a $(TMP1_DIR)/usr/lib/libgtest*.a
 
177
        -rm -rf $(TMP1_DIR)/usr/include/gmock $(TMP1_DIR)/usr/include/gtest
175
178
        dh_install --sourcedir=$(TMP1_DIR) -pqtmir-android
176
179
-endif
 
180
-       #clean gmock/gtest if it built in our build dir
 
181
-       -rm -f $(TMP2_DIR)/usr/lib/libgmock*.a $(TMP2_DIR)/usr/lib/libgtest*.a
 
182
-       -rm -rf $(TMP2_DIR)/usr/include/gmock $(TMP2_DIR)/usr/include/gtest
177
183
-       dh_install --sourcedir=$(TMP2_DIR) -pqtmir-desktop
178
184
-       dh_install --sourcedir=$(TMP2_DIR) -pqtdeclarative5-qtmir-plugin
179
185
-       dh_install --sourcedir=$(TMP2_DIR) -pqtmir-tests