| 1 |
commit: 7a45c4dcb255f80d2bc7c891f532bc81a95ecaa8 |
| 2 |
Author: Mark Wright <gienah <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 30 14:28:31 2015 +0000 |
| 4 |
Commit: Mark Wright <gienah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 14:29:41 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a45c4dc |
| 7 |
|
| 8 |
sci-mathematics/rstudio: Fix bug 558900, unbundle qtsingleapplication |
| 9 |
|
| 10 |
Thanks to Helmut Jarausch for reporting, Franz Fellner for suggesting patching |
| 11 |
rstudio to use dev-qt/qtsingleapplication[qt5] rather than the bundled version. |
| 12 |
Remove sys-devel/clang upper bound, thanks to Helmut Jarausch for reporting and |
| 13 |
testing with clang-3.6.2-r100. I tested it builds with clang-3.7.0_rc3. |
| 14 |
Fix bug 558988 sci-mathematics/rstudio-0.99.473 missing qt dependencies, |
| 15 |
thanks to Oleg and Anthony Staines for reporting and testing. |
| 16 |
|
| 17 |
Package-Manager: portage-2.2.20.1 |
| 18 |
|
| 19 |
.../rstudio-0.99.473-qtsingleapplication.patch | 60 ++++++ |
| 20 |
sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild | 225 +++++++++++++++++++++ |
| 21 |
2 files changed, 285 insertions(+) |
| 22 |
|
| 23 |
diff --git a/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch b/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch |
| 24 |
new file mode 100644 |
| 25 |
index 0000000..bf66bd2 |
| 26 |
--- /dev/null |
| 27 |
+++ b/sci-mathematics/rstudio/files/rstudio-0.99.473-qtsingleapplication.patch |
| 28 |
@@ -0,0 +1,60 @@ |
| 29 |
+--- rstudio-0.99.473-orig/src/cpp/desktop/CMakeLists.txt 2015-08-12 09:58:43.000000000 +1000 |
| 30 |
++++ rstudio-0.99.473/src/cpp/desktop/CMakeLists.txt 2015-08-30 23:16:11.396175587 +1000 |
| 31 |
+@@ -93,7 +93,12 @@ |
| 32 |
+ find_package(Qt5DBus REQUIRED) |
| 33 |
+ endif() |
| 34 |
+ |
| 35 |
+- |
| 36 |
++find_path(QTSINGLEAPPLIB_INCLUDE_DIR NAMES QtSingleApplication |
| 37 |
++ PATH_SUFFIXES QtSolutions |
| 38 |
++ PATHS |
| 39 |
++ /usr/include/qt5) |
| 40 |
++find_library(QTSINGLEAPPLIB Qt5Solutions_SingleApplication-2.6 |
| 41 |
++ libQt5Solutions_SingleApplication-2.6) |
| 42 |
+ |
| 43 |
+ # disable clang warnings for qt sources |
| 44 |
+ if(APPLE) |
| 45 |
+@@ -113,7 +118,6 @@ |
| 46 |
+ |
| 47 |
+ set(MOC_DESKTOP_HEADER_FILES ${DESKTOP_HEADER_FILES}) |
| 48 |
+ list(REMOVE_ITEM MOC_DESKTOP_HEADER_FILES |
| 49 |
+- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtsingleapplication/qtlockedfile.h |
| 50 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopDetectRHome.hpp |
| 51 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopOptions.hpp |
| 52 |
+ ${CMAKE_CURRENT_SOURCE_DIR}/DesktopRVersion.hpp |
| 53 |
+@@ -175,8 +179,6 @@ |
| 54 |
+ DesktopSubMenu.cpp |
| 55 |
+ DesktopSynctex.cpp |
| 56 |
+ DesktopNetworkAccessManager.cpp |
| 57 |
+- 3rdparty/qtsingleapplication/qtsingleapplication.cpp |
| 58 |
+- 3rdparty/qtsingleapplication/qtlocalpeer.cpp |
| 59 |
+ ) |
| 60 |
+ |
| 61 |
+ if(WIN32) |
| 62 |
+@@ -219,6 +221,7 @@ |
| 63 |
+ ${CORE_SOURCE_DIR}/include |
| 64 |
+ ${CMAKE_CURRENT_SOURCE_DIR} |
| 65 |
+ ${CMAKE_CURRENT_BINARY_DIR} |
| 66 |
++ ${QTSINGLEAPPLIB_INCLUDE_DIR} |
| 67 |
+ ${TESTS_INCLUDE_DIR} |
| 68 |
+ ) |
| 69 |
+ |
| 70 |
+@@ -332,6 +335,7 @@ |
| 71 |
+ |
| 72 |
+ # set link dependencies |
| 73 |
+ target_link_libraries(rstudio |
| 74 |
++ ${QTSINGLEAPPLIB} |
| 75 |
+ ${QT_LIBRARIES} |
| 76 |
+ rstudio-core |
| 77 |
+ ${LINK_FLAGS} |
| 78 |
+--- rstudio-0.99.473-orig/src/cpp/desktop/DesktopPosixApplication.hpp 2015-08-12 09:58:43.000000000 +1000 |
| 79 |
++++ rstudio-0.99.473/src/cpp/desktop/DesktopPosixApplication.hpp 2015-08-30 21:41:21.616934106 +1000 |
| 80 |
+@@ -16,7 +16,7 @@ |
| 81 |
+ #ifndef DESKTOP_POSIX_APPLICATION_HPP |
| 82 |
+ #define DESKTOP_POSIX_APPLICATION_HPP |
| 83 |
+ |
| 84 |
+-#include "3rdparty/qtsingleapplication/QtSingleApplication" |
| 85 |
++#include <QtSingleApplication> |
| 86 |
+ |
| 87 |
+ namespace rstudio { |
| 88 |
+ namespace desktop { |
| 89 |
|
| 90 |
diff --git a/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild |
| 91 |
new file mode 100644 |
| 92 |
index 0000000..b247a88 |
| 93 |
--- /dev/null |
| 94 |
+++ b/sci-mathematics/rstudio/rstudio-0.99.473-r1.ebuild |
| 95 |
@@ -0,0 +1,225 @@ |
| 96 |
+# Copyright 1999-2015 Gentoo Foundation |
| 97 |
+# Distributed under the terms of the GNU General Public License v2 |
| 98 |
+# $Id$ |
| 99 |
+ |
| 100 |
+EAPI=5 |
| 101 |
+ |
| 102 |
+inherit eutils user cmake-utils gnome2-utils pam versionator fdo-mime java-pkg-2 pax-utils |
| 103 |
+ |
| 104 |
+# TODO |
| 105 |
+# * package gin and gwt |
| 106 |
+# * use dict from tree, linguas |
| 107 |
+# * do src_test (use junit from tree?) |
| 108 |
+ |
| 109 |
+# update from scripts in dependencies/common |
| 110 |
+GWT_VER=2.7.0 |
| 111 |
+GIN_VER=1.5 |
| 112 |
+SELENIUM_VER=2.37.0 |
| 113 |
+CHROMEDRIVER_VER=2.7 |
| 114 |
+PANDOC_VER=1.13.1 |
| 115 |
+PACKRAT_VER=0.98.1000 |
| 116 |
+RMARKDOWN_VER=0.98.1000 |
| 117 |
+SHINYAPPS_VER=0.98.1000 |
| 118 |
+RSCONNECT_VER=0.4.1.4_fcac892a69817febd7b655b189bf57193260cda0 |
| 119 |
+ |
| 120 |
+DESCRIPTION="IDE for the R language" |
| 121 |
+HOMEPAGE="http://www.rstudio.org |
| 122 |
+ https://github.com/rstudio/rstudio/" |
| 123 |
+SRC_URI="https://github.com/rstudio/rstudio/archive/v${PV}.tar.gz -> ${P}.tar.gz |
| 124 |
+ https://s3.amazonaws.com/rstudio-buildtools/gin-${GIN_VER}.zip |
| 125 |
+ https://s3.amazonaws.com/rstudio-buildtools/gwt-${GWT_VER}.zip |
| 126 |
+ https://s3.amazonaws.com/rstudio-buildtools/selenium-java-${SELENIUM_VER}.zip |
| 127 |
+ https://s3.amazonaws.com/rstudio-buildtools/selenium-server-standalone-${SELENIUM_VER}.jar |
| 128 |
+ https://s3.amazonaws.com/rstudio-buildtools/chromedriver-linux |
| 129 |
+ https://s3.amazonaws.com/rstudio-dictionaries/core-dictionaries.zip |
| 130 |
+ https://dev.gentoo.org/~gienah/distfiles/packrat-${PACKRAT_VER}.tar.gz |
| 131 |
+ https://dev.gentoo.org/~gienah/distfiles/rmarkdown-${RMARKDOWN_VER}.tar.gz |
| 132 |
+ https://dev.gentoo.org/~gienah/distfiles/shinyapps-${SHINYAPPS_VER}.tar.gz |
| 133 |
+ https://dev.gentoo.org/~gienah/distfiles/rsconnect_${RSCONNECT_VER}.tar.gz |
| 134 |
+" |
| 135 |
+ |
| 136 |
+LICENSE="AGPL-3" |
| 137 |
+SLOT="0" |
| 138 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 139 |
+IUSE="dedicated server" |
| 140 |
+ |
| 141 |
+QT_VER=5.4 |
| 142 |
+QT_SLOT=5 |
| 143 |
+RDEPEND=" |
| 144 |
+ app-text/pandoc |
| 145 |
+ dev-haskell/pandoc-citeproc |
| 146 |
+ >=dev-lang/R-2.11.1 |
| 147 |
+ >=dev-libs/boost-1.50:= |
| 148 |
+ >=dev-libs/mathjax-2.3 |
| 149 |
+ dev-libs/openssl:0 |
| 150 |
+ sys-apps/util-linux |
| 151 |
+ >=sys-devel/clang-3.5.0 |
| 152 |
+ sys-libs/zlib |
| 153 |
+ || ( =virtual/jre-1.7*:= =virtual/jre-1.8*:= ) |
| 154 |
+ x11-libs/pango |
| 155 |
+ !dedicated? ( |
| 156 |
+ >=dev-qt/qtcore-${QT_VER}:${QT_SLOT} |
| 157 |
+ >=dev-qt/qtdeclarative-${QT_VER}:${QT_SLOT} |
| 158 |
+ >=dev-qt/qtdbus-${QT_VER}:${QT_SLOT} |
| 159 |
+ >=dev-qt/qtgui-${QT_VER}:${QT_SLOT} |
| 160 |
+ >=dev-qt/qtnetwork-${QT_VER}:${QT_SLOT} |
| 161 |
+ >=dev-qt/qtopengl-${QT_VER}:${QT_SLOT} |
| 162 |
+ >=dev-qt/qtpositioning-${QT_VER}:${QT_SLOT} |
| 163 |
+ >=dev-qt/qtprintsupport-${QT_VER}:${QT_SLOT} |
| 164 |
+ >=dev-qt/qtsingleapplication-2.6.1_p20150629[qt5] |
| 165 |
+ >=dev-qt/qtsensors-${QT_VER}:${QT_SLOT} |
| 166 |
+ >=dev-qt/qtsql-${QT_VER}:${QT_SLOT} |
| 167 |
+ >=dev-qt/qtsvg-${QT_VER}:${QT_SLOT} |
| 168 |
+ >=dev-qt/qtwebkit-${QT_VER}:${QT_SLOT} |
| 169 |
+ >=dev-qt/qtwidgets-${QT_VER}:${QT_SLOT} |
| 170 |
+ >=dev-qt/qtxml-${QT_VER}:${QT_SLOT} |
| 171 |
+ >=dev-qt/qtxmlpatterns-${QT_VER}:${QT_SLOT} |
| 172 |
+ server? ( virtual/pam ) |
| 173 |
+ ) |
| 174 |
+ dedicated? ( virtual/pam )" |
| 175 |
+DEPEND="${RDEPEND} |
| 176 |
+ app-arch/unzip |
| 177 |
+ dev-java/ant-core |
| 178 |
+ || ( =virtual/jdk-1.7*:= =virtual/jdk-1.8*:= ) |
| 179 |
+ virtual/pkgconfig" |
| 180 |
+# test? ( dev-java/junit:4 ) |
| 181 |
+ |
| 182 |
+src_unpack() { |
| 183 |
+ unpack ${P}.tar.gz gwt-${GWT_VER}.zip |
| 184 |
+ cd "${S}" || die |
| 185 |
+ mkdir -p src/gwt/lib/{gin,gwt} \ |
| 186 |
+ dependencies/common/dictionaries \ |
| 187 |
+ src/gwt/lib/selenium/${SELENIUM_VER} \ |
| 188 |
+ src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER} || die |
| 189 |
+ mv ../gwt-${GWT_VER} src/gwt/lib/gwt/${GWT_VER} || die |
| 190 |
+ unzip -qd src/gwt/lib/gin/${GIN_VER} \ |
| 191 |
+ "${DISTDIR}"/gin-${GIN_VER}.zip || die |
| 192 |
+ unzip -qd dependencies/common/dictionaries \ |
| 193 |
+ "${DISTDIR}"/core-dictionaries.zip || die |
| 194 |
+ unzip -qd src/gwt/lib/selenium/${SELENIUM_VER} \ |
| 195 |
+ "${DISTDIR}"/selenium-java-${SELENIUM_VER}.zip || die |
| 196 |
+ cp "${DISTDIR}"/selenium-server-standalone-${SELENIUM_VER}.jar \ |
| 197 |
+ src/gwt/lib/selenium/${SELENIUM_VER}/ || die |
| 198 |
+ cp "${DISTDIR}"/chromedriver-linux \ |
| 199 |
+ src/gwt/lib/selenium/chromedriver/${CHROMEDRIVER_VER}/ || die |
| 200 |
+ cd dependencies/common || die |
| 201 |
+ unpack packrat-${PACKRAT_VER}.tar.gz |
| 202 |
+ unpack rmarkdown-${RMARKDOWN_VER}.tar.gz |
| 203 |
+ unpack shinyapps-${SHINYAPPS_VER}.tar.gz |
| 204 |
+ unpack rsconnect_${RSCONNECT_VER}.tar.gz |
| 205 |
+ cp "${DISTDIR}"/rmarkdown-${RMARKDOWN_VER}.tar.gz \ |
| 206 |
+ . || die |
| 207 |
+ cp "${DISTDIR}"/packrat-${PACKRAT_VER}.tar.gz \ |
| 208 |
+ . || die |
| 209 |
+ cp "${DISTDIR}"/shinyapps-${SHINYAPPS_VER}.tar.gz \ |
| 210 |
+ . || die |
| 211 |
+ cp "${DISTDIR}"/rsconnect_${RSCONNECT_VER}.tar.gz \ |
| 212 |
+ . || die |
| 213 |
+} |
| 214 |
+ |
| 215 |
+src_prepare() { |
| 216 |
+ java-pkg-2_src_prepare |
| 217 |
+ |
| 218 |
+ find . -name .gitignore -delete || die |
| 219 |
+ |
| 220 |
+ epatch "${FILESDIR}"/${PN}-0.98.490-prefs.patch \ |
| 221 |
+ "${FILESDIR}"/${PN}-0.99.473-paths.patch \ |
| 222 |
+ "${FILESDIR}"/${PN}-0.99.473-clang-pandoc.patch \ |
| 223 |
+ "${FILESDIR}"/${PN}-0.98.490-linker_flags.patch \ |
| 224 |
+ "${FILESDIR}"/${PN}-0.98.1091-boost-1.57.patch \ |
| 225 |
+ "${FILESDIR}"/${PN}-0.99.473-qtsingleapplication.patch |
| 226 |
+ |
| 227 |
+ # Adding -DDISTRO_SHARE=... to append-flags breaks cmake so using |
| 228 |
+ # this sed hack for now. ~RMH |
| 229 |
+ sed -i \ |
| 230 |
+ -e "s|DISTRO_SHARE|\"share/${PN}\"|g" \ |
| 231 |
+ src/cpp/server/ServerOptions.cpp \ |
| 232 |
+ src/cpp/session/SessionOptions.cpp || die |
| 233 |
+ |
| 234 |
+ # use mathjax from system |
| 235 |
+ ln -sf "${EPREFIX}"/usr/share/mathjax dependencies/common/mathjax-23 || die |
| 236 |
+ |
| 237 |
+ # make sure icons and mime stuff are with prefix |
| 238 |
+ sed -i \ |
| 239 |
+ -e "s:/usr:${EPREFIX}/usr:g" \ |
| 240 |
+ CMakeGlobals.txt src/cpp/desktop/CMakeLists.txt || die |
| 241 |
+ |
| 242 |
+ # On Gentoo the rstudio-server configuration file is /etc/conf.d/rstudio-server.conf |
| 243 |
+ sed -e "s@/etc/rstudio/rserver.conf@${EROOT}etc/conf.d/rstudio-server.conf@" \ |
| 244 |
+ -i src/cpp/server/ServerOptions.cpp \ |
| 245 |
+ || die |
| 246 |
+ |
| 247 |
+ # Set the rsession.conf file location for Gentoo prefix |
| 248 |
+ sed -e "s@/etc/rstudio/rsession.conf@${EROOT}etc/rstudio/rsession.conf@" \ |
| 249 |
+ -i src/cpp/session/SessionOptions.cpp \ |
| 250 |
+ || die |
| 251 |
+ |
| 252 |
+ # dev-qt/qtsingleapplication-2.6.1_p20150629 does not provide a cmake module. |
| 253 |
+ # It provides a library that has its version number appended to the end, |
| 254 |
+ # which is difficult to handle in cmake, as find_library does not support |
| 255 |
+ # searching for wildcard library names. So I find the library name from the |
| 256 |
+ # qmake spec, and then sed this into the patched src/cpp/desktop/CMakeLists.txt. |
| 257 |
+ rm -rf "${S}"/src/cpp/desktop/3rdparty || die |
| 258 |
+ local s=$(grep '\-lQt$${QT_MAJOR_VERSION}Solutions_SingleApplication' \ |
| 259 |
+ "${EROOT}"/usr/lib64/qt5/mkspecs/features/qtsingleapplication.prf \ |
| 260 |
+ | sed -e 's@\$\${QT_MAJOR_VERSION}@5@' \ |
| 261 |
+ -e 's@LIBS \*= -l@@') |
| 262 |
+ sed -e "s@Qt5Solutions_SingleApplication-2.6@${s}@g" \ |
| 263 |
+ -i "${S}"/src/cpp/desktop/CMakeLists.txt \ |
| 264 |
+ || die |
| 265 |
+} |
| 266 |
+ |
| 267 |
+src_configure() { |
| 268 |
+ export RSTUDIO_VERSION_MAJOR=$(get_version_component_range 1) |
| 269 |
+ export RSTUDIO_VERSION_MINOR=$(get_version_component_range 2) |
| 270 |
+ export RSTUDIO_VERSION_PATCH=$(get_version_component_range 3) |
| 271 |
+ |
| 272 |
+ local mycmakeargs=( |
| 273 |
+ -DDISTRO_SHARE=share/${PN} |
| 274 |
+ $(cmake-utils_use !dedicated RSTUDIO_INSTALL_FREEDESKTOP) |
| 275 |
+ -DRSTUDIO_TARGET=$(usex dedicated "Server" "$(usex server "Development" "Desktop")") |
| 276 |
+ -DQT_QMAKE_EXECUTABLE="${EROOT}"usr/lib64/qt5/bin/qmake |
| 277 |
+ ) |
| 278 |
+ |
| 279 |
+ cmake-utils_src_configure |
| 280 |
+} |
| 281 |
+ |
| 282 |
+src_compile() { |
| 283 |
+ cmake-utils_src_compile |
| 284 |
+} |
| 285 |
+ |
| 286 |
+src_install() { |
| 287 |
+ cmake-utils_src_install |
| 288 |
+ pax-mark m "${ED}usr/bin/rstudio" |
| 289 |
+ doconfd "${FILESDIR}"/rstudio-server.conf |
| 290 |
+ dodir /etc/rstudio |
| 291 |
+ insinto /etc/rstudio |
| 292 |
+ doins "${FILESDIR}"/rsession.conf |
| 293 |
+ dosym /etc/conf.d/rstudio-server.conf /etc/rstudio/rserver.conf |
| 294 |
+ if use dedicated || use server; then |
| 295 |
+ dopamd src/cpp/server/extras/pam/rstudio |
| 296 |
+ newinitd "${FILESDIR}"/rstudio-server.initd rstudio-server |
| 297 |
+ fi |
| 298 |
+} |
| 299 |
+ |
| 300 |
+pkg_preinst() { |
| 301 |
+ use dedicated || gnome2_icon_savelist |
| 302 |
+ java-pkg-2_pkg_preinst |
| 303 |
+} |
| 304 |
+ |
| 305 |
+pkg_postinst() { |
| 306 |
+ use dedicated || { fdo-mime_desktop_database_update |
| 307 |
+ fdo-mime_mime_database_update |
| 308 |
+ gnome2_icon_cache_update ;} |
| 309 |
+ |
| 310 |
+ if use dedicated || use server; then |
| 311 |
+ enewgroup rstudio-server |
| 312 |
+ enewuser rstudio-server -1 -1 -1 rstudio-server |
| 313 |
+ fi |
| 314 |
+} |
| 315 |
+ |
| 316 |
+pkg_postrm() { |
| 317 |
+ use dedicated || { fdo-mime_desktop_database_update |
| 318 |
+ fdo-mime_mime_database_update |
| 319 |
+ gnome2_icon_cache_update ;} |
| 320 |
+} |
Archives