root
5 years ago
parent
97e5fb241c
commit
91433cf4f0
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +0,0 @@
|
||||
DIST QtBitcoinTrader-1.10.01.tar.gz 1319323 BLAKE2B 8d3a17600607d44ee2112a65c321ecb864dfea89bf13f3dbd3a98819e7fa55c9e36a0ec3e7a09ab39746cc53034870becae336ada5e0c002bd0e43f8bdc4b752 SHA512 a9f2aa86225d24d4492c3d375a00490ec72405391396669aea21cba7fa2e4afb088e35743ecf15045ba12c7294d972ecced59e19b46c83a9c4930604c530d999
|
||||
@ -1,54 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
if [[ $PV = *9999* ]]; then
|
||||
eclass=git-r3
|
||||
EGIT_REPO_URI="https://github.com/JulyIGHOR/QtBitcoinTrader.git"
|
||||
EGIT_BRANCH="testing"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
eclass=vcs-snapshot
|
||||
SRC_URI="https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
inherit base fdo-mime qmake-utils ${eclass}
|
||||
|
||||
DESCRIPTION="Mt.Gox and BTC-e Bitcoin Trading Client"
|
||||
HOMEPAGE="https://github.com/JulyIGHOR/QtBitcoinTrader"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
dev-libs/openssl:0
|
||||
sys-libs/zlib
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtnetwork:5
|
||||
dev-qt/qtscript:5
|
||||
dev-qt/qtwidgets:5
|
||||
dev-qt/qtmultimedia:5
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
eqmake5 \
|
||||
src/${PN}_Desktop.pro \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
DESKTOPDIR="${EPREFIX}/usr/share/applications" \
|
||||
ICONDIR="${EPREFIX}/usr/share/pixmaps"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake INSTALL_ROOT="${D}" install
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -1,54 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
if [[ $PV = *9999* ]]; then
|
||||
eclass=git-r3
|
||||
EGIT_REPO_URI="https://github.com/JulyIGHOR/QtBitcoinTrader.git"
|
||||
EGIT_BRANCH="testing"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
eclass=vcs-snapshot
|
||||
SRC_URI="https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
inherit base fdo-mime qmake-utils ${eclass}
|
||||
|
||||
DESCRIPTION="Mt.Gox and BTC-e Bitcoin Trading Client"
|
||||
HOMEPAGE="https://github.com/JulyIGHOR/QtBitcoinTrader"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
dev-libs/openssl:0
|
||||
sys-libs/zlib
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtnetwork:5
|
||||
dev-qt/qtscript:5
|
||||
dev-qt/qtwidgets:5
|
||||
dev-qt/qtmultimedia:5
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
eqmake5 \
|
||||
src/${PN}_Desktop.pro \
|
||||
PREFIX="${EPREFIX}/usr" \
|
||||
DESKTOPDIR="${EPREFIX}/usr/share/applications" \
|
||||
ICONDIR="${EPREFIX}/usr/share/pixmaps"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake INSTALL_ROOT="${D}" install
|
||||
einstalldocs
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>alexxy@gentoo.org</email>
|
||||
<name>Alexey Shvetsov</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">JulyIGHOR/QtBitcoinTrader</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,105 @@
|
||||
From bf93bae6990b01ee726b59b0969b93585719671a Mon Sep 17 00:00:00 2001
|
||||
From: Michael Weghorn <m.weghorn@posteo.de>
|
||||
Date: Wed, 30 Jan 2019 10:11:35 +0100
|
||||
Subject: tdf#122752 gtk3_kde5: Use non-native fpicker for non-Plasma desktops
|
||||
|
||||
Adding the custom widgets to the native dialog currently depends
|
||||
on the native dialog using a KFileWidget, which is just the case for
|
||||
the native QFileDialog implementation on Plasma/KDE5.
|
||||
|
||||
In order not to lose custom controls for non-Plasma desktops,
|
||||
fall back to using the non-native QFileDialog there and adding
|
||||
the custom controls to its layout.
|
||||
This was mostly taken over from Qt5FileDialog.
|
||||
(This is a similar approach as that taken for the kde5 VCL plugin
|
||||
in https://gerrit.libreoffice.org/#/c/67106/ ).
|
||||
|
||||
Adding the controls to the layout returned by 'QFileDialog::layout()'
|
||||
cannot be used for the native dialog as well, since a nullptr is
|
||||
returned in this case.
|
||||
|
||||
From QFileDialog doc:
|
||||
|
||||
> By default, a platform-native file dialog will be used if the platform
|
||||
> has one. In that case, the widgets which would otherwise be used to
|
||||
> construct the dialog will not be instantiated, so related accessors such
|
||||
> as layout() and itemDelegate() will return null. You can set the
|
||||
> DontUseNativeDialog option to ensure that the widget-based
|
||||
> implementation will be used instead of the native dialog.
|
||||
|
||||
Change-Id: I75fbe7731da28d0dc7df878f4c57e141d4d89902
|
||||
Reviewed-on: https://gerrit.libreoffice.org/67111
|
||||
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
|
||||
Tested-by: Michael Weghorn <m.weghorn@posteo.de>
|
||||
---
|
||||
vcl/unx/gtk3_kde5/kde5_filepicker.cxx | 26 +++++++++++++++++++++++++-
|
||||
vcl/unx/gtk3_kde5/kde5_filepicker.hxx | 2 ++
|
||||
2 files changed, 27 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
|
||||
index 42e278a..33f64ad0 100644
|
||||
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
|
||||
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.cxx
|
||||
@@ -17,6 +17,8 @@
|
||||
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
*/
|
||||
|
||||
+#include <vcl/svapp.hxx>
|
||||
+
|
||||
#include "kde5_filepicker.hxx"
|
||||
|
||||
#include <KWindowSystem>
|
||||
@@ -57,7 +59,7 @@ KDE5FilePicker::KDE5FilePicker(QObject* parent)
|
||||
connect(_dialog, &QFileDialog::filterSelected, this, &KDE5FilePicker::filterChanged);
|
||||
connect(_dialog, &QFileDialog::fileSelected, this, &KDE5FilePicker::selectionChanged);
|
||||
|
||||
- qApp->installEventFilter(this);
|
||||
+ setupCustomWidgets();
|
||||
}
|
||||
|
||||
void KDE5FilePicker::enableFolderMode()
|
||||
@@ -232,6 +234,28 @@ void KDE5FilePicker::initialize(bool saveDialog)
|
||||
|
||||
void KDE5FilePicker::setWinId(sal_uIntPtr winId) { _winId = winId; }
|
||||
|
||||
+void KDE5FilePicker::setupCustomWidgets()
|
||||
+{
|
||||
+ // When using the platform-native Plasma/KDE5 file picker, we currently rely on KFileWidget
|
||||
+ // being present to add the custom controls visible (s. 'eventFilter' method).
|
||||
+ // Since this doesn't work for other desktop environments, use a non-native
|
||||
+ // dialog there in order not to lose the custom controls and insert the custom
|
||||
+ // widget in the layout returned by QFileDialog::layout()
|
||||
+ // (which returns nullptr for native file dialogs)
|
||||
+ if (Application::GetDesktopEnvironment() == "KDE5")
|
||||
+ {
|
||||
+ qApp->installEventFilter(this);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ _dialog->setOption(QFileDialog::DontUseNativeDialog);
|
||||
+ QGridLayout* pLayout = static_cast<QGridLayout*>(_dialog->layout());
|
||||
+ assert(pLayout);
|
||||
+ const int row = pLayout->rowCount();
|
||||
+ pLayout->addWidget(_extraControls, row, 1);
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
bool KDE5FilePicker::eventFilter(QObject* o, QEvent* e)
|
||||
{
|
||||
if (e->type() == QEvent::Show && o->isWidgetType())
|
||||
diff --git a/vcl/unx/gtk3_kde5/kde5_filepicker.hxx b/vcl/unx/gtk3_kde5/kde5_filepicker.hxx
|
||||
index d999f7b..c979a5d 100644
|
||||
--- a/vcl/unx/gtk3_kde5/kde5_filepicker.hxx
|
||||
+++ b/vcl/unx/gtk3_kde5/kde5_filepicker.hxx
|
||||
@@ -98,6 +98,8 @@ public:
|
||||
|
||||
private:
|
||||
Q_DISABLE_COPY(KDE5FilePicker)
|
||||
+ // adds the custom controls to the dialog
|
||||
+ void setupCustomWidgets();
|
||||
|
||||
protected:
|
||||
bool eventFilter(QObject* watched, QEvent* event) override;
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
Binary file not shown.
@ -1,34 +0,0 @@
|
||||
From 7b434a7ad9333a3b2250d636a517c58d9a12bca2 Mon Sep 17 00:00:00 2001
|
||||
From: Pekka Vuorela <pekka.vuorela@jollamobile.com>
|
||||
Date: Fri, 15 Dec 2017 16:56:20 +0200
|
||||
Subject: Honor configuration for building glibc copy of strtok_r
|
||||
|
||||
config.h didn't get included and HAVE_STRTOK_R was never defined.
|
||||
Now getting via glibc.h.
|
||||
---
|
||||
goo/glibc_strtok_r.cc | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/goo/glibc_strtok_r.cc b/goo/glibc_strtok_r.cc
|
||||
index e779bf5..e323bc2 100644
|
||||
--- a/goo/glibc_strtok_r.cc
|
||||
+++ b/goo/glibc_strtok_r.cc
|
||||
@@ -50,12 +50,15 @@
|
||||
// Copyright (C) 2012 Alexey Pavlov <alexpux@gmail.com>
|
||||
// Copyright (C) 2012 Albert Astals Cid <aacid@kde.org>
|
||||
// Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
|
||||
+// Copyright (C) 2017 Pekka Vuorela <pekka.vuorela@jollamobile.com>
|
||||
//
|
||||
// To see a description of the changes please see the Changelog file that
|
||||
// came with your tarball or type make ChangeLog if you are building from git
|
||||
//
|
||||
//========================================================================
|
||||
|
||||
+#include "glibc.h"
|
||||
+
|
||||
#ifndef HAVE_STRTOK_R
|
||||
|
||||
#include <string.h>
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
Sadly the CMake side of openjpeg slotting in Gentoo is broken.
|
||||
To reliably find openjpeg:2 we need to use pkg-config.
|
||||
|
||||
--- poppler-0.62.0/CMakeLists.txt
|
||||
+++ poppler-0.62.0/CMakeLists.txt
|
||||
@@ -193,7 +193,7 @@
|
||||
endif()
|
||||
set(WITH_OPENJPEG FALSE)
|
||||
if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
|
||||
- find_package(LIBOPENJPEG2)
|
||||
+ pkg_check_modules(LIBOPENJPEG2 libopenjp2)
|
||||
set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
|
||||
if(NOT LIBOPENJPEG2_FOUND)
|
||||
message(FATAL_ERROR "Install libopenjpeg2 before trying to build poppler. You can also decide to use the internal unmaintained JPX decoder or none at all.")
|
||||
@ -0,0 +1,36 @@
|
||||
https://bugs.gentoo.org/670252
|
||||
|
||||
From de34900993bff73c8da651319027b2fa8c490172 Mon Sep 17 00:00:00 2001
|
||||
From: Ed Porras <ed@motologic.com>
|
||||
Date: Sun, 26 Aug 2018 20:24:23 +0200
|
||||
Subject: [PATCH] fix macOS compilation due to boolean define in jpeglib
|
||||
|
||||
typedef enum { FALSE = 0, TRUE = 1 } boolean;
|
||||
---
|
||||
goo/JpegWriter.cc | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc
|
||||
index 16c97afe..26fa77a7 100644
|
||||
--- a/goo/JpegWriter.cc
|
||||
+++ b/goo/JpegWriter.cc
|
||||
@@ -11,6 +11,7 @@
|
||||
// Copyright (C) 2013 Peter Breitenlohner <peb@mppmu.mpg.de>
|
||||
// Copyright (C) 2017, 2018 Albert Astals Cid <aacid@kde.org>
|
||||
// Copyright (C) 2018 Martin Packman <gzlist@googlemail.com>
|
||||
+// Copyright (C) 2018 Ed Porras <ed@motologic.com>
|
||||
//
|
||||
//========================================================================
|
||||
|
||||
@@ -143,7 +144,7 @@ bool JpegWriter::init(FILE *f, int width, int height, int hDPI, int vDPI)
|
||||
}
|
||||
|
||||
// Set whether to compute optimal Huffman coding tables
|
||||
- priv->cinfo.optimize_coding = priv->optimize;
|
||||
+ priv->cinfo.optimize_coding = static_cast<boolean>(priv->optimize);
|
||||
|
||||
// Get ready for data
|
||||
jpeg_start_compress(&priv->cinfo, TRUE);
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,127 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
|
||||
|
||||
if [[ "${PV}" == "9999" ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
|
||||
SLOT="0/9999"
|
||||
else
|
||||
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
SLOT="0/73" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
|
||||
fi
|
||||
|
||||
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
|
||||
HOMEPAGE="https://poppler.freedesktop.org/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
|
||||
|
||||
# No test data provided
|
||||
RESTRICT="test"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=media-libs/fontconfig-2.6.0
|
||||
>=media-libs/freetype-2.3.9
|
||||
sys-libs/zlib
|
||||
cairo? (
|
||||
dev-libs/glib:2
|
||||
>=x11-libs/cairo-1.10.0
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
|
||||
)
|
||||
curl? ( net-misc/curl )
|
||||
jpeg? ( virtual/jpeg:0 )
|
||||
jpeg2k? ( media-libs/openjpeg:2= )
|
||||
lcms? ( media-libs/lcms:2 )
|
||||
nss? ( >=dev-libs/nss-3.19:0 )
|
||||
png? ( media-libs/libpng:0= )
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtxml:5
|
||||
)
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
cjk? ( >=app-text/poppler-data-0.4.7 )
|
||||
"
|
||||
|
||||
DOCS=(AUTHORS NEWS README README-XPDF)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
|
||||
"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
|
||||
"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
|
||||
"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
|
||||
"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
|
||||
"${FILESDIR}/${P}-glibc.patch" # bug 643858
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
|
||||
# Clang doesn't grok this flag, the configure nicely tests that, but
|
||||
# cmake just uses it, so remove it if we use clang
|
||||
if [[ ${CC} == clang ]] ; then
|
||||
sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
|
||||
fi
|
||||
|
||||
if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
|
||||
sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
|
||||
-i CMakeLists.txt || die
|
||||
else
|
||||
einfo "policy(SET CMP0002 OLD) - workaround can be removed"
|
||||
fi
|
||||
|
||||
# we need to up the C++ version, bug #622526, #643278
|
||||
append-cxxflags -std=c++11
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
xdg_environment_reset
|
||||
local mycmakeargs=(
|
||||
-DBUILD_GTK_TESTS=OFF
|
||||
-DBUILD_QT5_TESTS=OFF
|
||||
-DBUILD_CPP_TESTS=OFF
|
||||
-DENABLE_SPLASH=ON
|
||||
-DENABLE_ZLIB=ON
|
||||
-DENABLE_ZLIB_UNCOMPRESS=OFF
|
||||
-DENABLE_XPDF_HEADERS=ON
|
||||
-DSPLASH_CMYK=OFF
|
||||
-DUSE_FIXEDPOINT=OFF
|
||||
-DUSE_FLOAT=OFF
|
||||
-DWITH_Cairo=$(usex cairo)
|
||||
-DENABLE_LIBCURL=$(usex curl)
|
||||
-DENABLE_CPP=$(usex cxx)
|
||||
-DWITH_GObjectIntrospection=$(usex introspection)
|
||||
-DWITH_JPEG=$(usex jpeg)
|
||||
-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
|
||||
-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
|
||||
-DENABLE_CMS=$(usex lcms lcms2 none)
|
||||
-DWITH_NSS3=$(usex nss)
|
||||
-DWITH_PNG=$(usex png)
|
||||
$(cmake-utils_use_find_package qt5 Qt5Core)
|
||||
-DWITH_TIFF=$(usex tiff)
|
||||
-DENABLE_UTILS=$(usex utils)
|
||||
)
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
# live version doesn't provide html documentation
|
||||
if use cairo && use doc && [[ ${PV} != 9999 ]]; then
|
||||
# For now install gtk-doc there
|
||||
insinto /usr/share/gtk-doc/html/poppler
|
||||
doins -r "${S}"/glib/reference/html/*
|
||||
fi
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,799 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
MY_EXTRAS_VER="20190126-1919Z"
|
||||
|
||||
CMAKE_MAKEFILE_GENERATOR=emake
|
||||
|
||||
# Keeping eutils in EAPI=6 for emktemp in pkg_config
|
||||
|
||||
inherit eutils flag-o-matic prefix toolchain-funcs \
|
||||
user cmake-utils multilib-build
|
||||
|
||||
SRC_URI="http://cdn.mysql.com/Downloads/MySQL-5.6/${P}.tar.gz
|
||||
https://cdn.mysql.com/archives/mysql-5.6/${P}.tar.gz
|
||||
http://downloads.mysql.com/archives/MySQL-5.6/${P}.tar.gz"
|
||||
|
||||
# Gentoo patches to MySQL
|
||||
if [[ "${MY_EXTRAS_VER}" != "live" && "${MY_EXTRAS_VER}" != "none" ]]; then
|
||||
SRC_URI="${SRC_URI}
|
||||
mirror://gentoo/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
|
||||
https://gitweb.gentoo.org/proj/mysql-extras.git/snapshot/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
|
||||
https://dev.gentoo.org/~grknight/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
|
||||
https://dev.gentoo.org/~robbat2/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2
|
||||
https://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-${MY_EXTRAS_VER}.tar.bz2"
|
||||
fi
|
||||
|
||||
HOMEPAGE="https://www.mysql.com/"
|
||||
DESCRIPTION="A fast, multi-threaded, multi-user SQL database server"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0/18"
|
||||
IUSE="client-libs cracklib debug jemalloc latin1 libressl numa +perl profiling selinux
|
||||
+server static static-libs systemtap tcmalloc test yassl"
|
||||
|
||||
# Tests always fail when libressl is enabled due to hard-coded ciphers in the tests
|
||||
RESTRICT="libressl? ( test )"
|
||||
|
||||
REQUIRED_USE="?? ( tcmalloc jemalloc ) static? ( yassl )"
|
||||
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
|
||||
|
||||
# Shorten the path because the socket path length must be shorter than 107 chars
|
||||
# and we will run a mysql server during test phase
|
||||
S="${WORKDIR}/mysql"
|
||||
|
||||
if [[ "${MY_EXTRAS_VER}" == "live" ]] ; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/mysql-extras.git"
|
||||
EGIT_CHECKOUT_DIR="${WORKDIR}/mysql-extras"
|
||||
EGIT_CLONE_TYPE=shallow
|
||||
MY_PATCH_DIR="${WORKDIR}/mysql-extras"
|
||||
else
|
||||
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
|
||||
fi
|
||||
|
||||
PATCHES=(
|
||||
"${MY_PATCH_DIR}"/01050_all_mysql_config_cleanup-5.6.patch
|
||||
"${MY_PATCH_DIR}"/02040_all_embedded-library-shared-5.5.10.patch
|
||||
"${MY_PATCH_DIR}"/20006_all_cmake_elib-mysql-5.6.35.patch
|
||||
"${MY_PATCH_DIR}"/20007_all_cmake-debug-werror-5.6.22.patch
|
||||
"${MY_PATCH_DIR}"/20008_all_mysql-tzinfo-symlink-5.6.37.patch
|
||||
"${MY_PATCH_DIR}"/20009_all_mysql_myodbc_symbol_fix-5.6.patch
|
||||
"${MY_PATCH_DIR}"/20018_all_mysql-5.6.25-without-clientlibs-tools.patch
|
||||
"${MY_PATCH_DIR}"/20027_all_mysql-5.5-perl5.26-includes.patch
|
||||
"${MY_PATCH_DIR}"/20028_all_mysql-5.6-gcc7.patch
|
||||
"${MY_PATCH_DIR}"/20031_all_mysql-5.6-fix-monitor.test.patch
|
||||
"${MY_PATCH_DIR}"/20036_all_mysql-5.6-fix-rpl_semi_sync_shutdown_hang.test.patch
|
||||
)
|
||||
|
||||
# Be warned, *DEPEND are version-dependant
|
||||
# These are used for both runtime and compiletime
|
||||
COMMON_DEPEND="
|
||||
kernel_linux? (
|
||||
sys-process/procps:0=
|
||||
dev-libs/libaio:0=
|
||||
)
|
||||
net-misc/curl
|
||||
>=sys-apps/sed-4
|
||||
>=sys-apps/texinfo-4.7-r1
|
||||
jemalloc? ( dev-libs/jemalloc:0= )
|
||||
tcmalloc? ( dev-util/google-perftools:0= )
|
||||
systemtap? ( >=dev-util/systemtap-1.3:0= )
|
||||
!yassl? (
|
||||
!libressl? ( >=dev-libs/openssl-1.0.0:0= )
|
||||
libressl? ( dev-libs/libressl:0= )
|
||||
)
|
||||
>=sys-libs/zlib-1.2.3:0=
|
||||
sys-libs/ncurses:0=
|
||||
server? (
|
||||
numa? ( sys-process/numactl )
|
||||
)
|
||||
!client-libs? ( dev-db/mysql-connector-c[${MULTILIB_USEDEP},static-libs?] )
|
||||
"
|
||||
DEPEND="virtual/yacc
|
||||
static? ( sys-libs/ncurses[static-libs] )
|
||||
test? ( dev-perl/JSON )
|
||||
|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )
|
||||
${COMMON_DEPEND}"
|
||||
RDEPEND="selinux? ( sec-policy/selinux-mysql )
|
||||
client-libs? ( !dev-db/mariadb-connector-c[mysqlcompat] !dev-db/mysql-connector-c )
|
||||
!dev-db/mariadb !dev-db/mariadb-galera !dev-db/percona-server !dev-db/mysql-cluster
|
||||
server? ( !prefix? ( dev-db/mysql-init-scripts ) )
|
||||
${COMMON_DEPEND}
|
||||
"
|
||||
# For other stuff to bring us in
|
||||
# dev-perl/DBD-mysql is needed by some scripts installed by MySQL
|
||||
PDEPEND="perl? ( >=dev-perl/DBD-mysql-2.9004 )"
|
||||
|
||||
pkg_setup() {
|
||||
if [[ ${MERGE_TYPE} != binary ]] ; then
|
||||
local GCC_MAJOR_SET=$(gcc-major-version)
|
||||
local GCC_MINOR_SET=$(gcc-minor-version)
|
||||
# Bug 565584. InnoDB now requires atomic functions introduced with gcc-4.7 on
|
||||
# non x86{,_64} arches
|
||||
if ! use amd64 && ! use x86 && [[ ${GCC_MAJOR_SET} -lt 4 || \
|
||||
${GCC_MAJOR_SET} -eq 4 && ${GCC_MINOR_SET} -lt 7 ]] ; then
|
||||
eerror "${PN} needs to be built with gcc-4.7 or later."
|
||||
eerror "Please use gcc-config to switch to gcc-4.7 or later version."
|
||||
die
|
||||
fi
|
||||
fi
|
||||
if has test ${FEATURES} && \
|
||||
use server && ! has userpriv ${FEATURES} ; then
|
||||
eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
|
||||
fi
|
||||
|
||||
# This should come after all of the die statements
|
||||
enewgroup mysql 60 || die "problem adding 'mysql' group"
|
||||
enewuser mysql 60 -1 /dev/null mysql || die "problem adding 'mysql' user"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Here we need to see if the implementation switched client libraries
|
||||
# We check if this is a new instance of the package and a client library already exists
|
||||
local SHOW_ABI_MESSAGE libpath
|
||||
if use client-libs && [[ -z ${REPLACING_VERSIONS} && -e "${EROOT%/}/usr/$(get_libdir)/libmysqlclient.so" ]] ; then
|
||||
libpath=$(readlink "${EROOT%/}/usr/$(get_libdir)/libmysqlclient.so")
|
||||
elog "Due to ABI changes when switching between different client libraries,"
|
||||
elog "revdep-rebuild must find and rebuild all packages linking to libmysqlclient."
|
||||
elog "Please run: revdep-rebuild --library ${libpath}"
|
||||
ewarn "Failure to run revdep-rebuild may cause issues with other programs or libraries"
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# Make sure the vars are correctly initialized
|
||||
mysql_init_vars
|
||||
|
||||
# Create log directory securely if it does not exist
|
||||
[[ -d "${ROOT}${MY_LOGDIR}" ]] || install -d -m0750 -o mysql -g mysql "${ROOT}${MY_LOGDIR}"
|
||||
|
||||
if use server ; then
|
||||
if [[ -z "${REPLACING_VERSIONS}" ]] ; then
|
||||
einfo
|
||||
elog "You might want to run:"
|
||||
elog "\"emerge --config =${CATEGORY}/${PF}\""
|
||||
elog "if this is a new install."
|
||||
elog
|
||||
elog "If you are switching server implentations, you should run the"
|
||||
elog "mysql_upgrade tool."
|
||||
einfo
|
||||
else
|
||||
einfo
|
||||
elog "If you are upgrading major versions, you should run the"
|
||||
elog "mysql_upgrade tool."
|
||||
einfo
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
# Grab the patches
|
||||
[[ "${MY_EXTRAS_VER}" == "live" ]] && S="${WORKDIR}/mysql-extras" git-r3_src_unpack
|
||||
|
||||
mv -f "${WORKDIR}/${P}" "${S}" || die
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
_disable_engine() {
|
||||
echo > "${S%/}/storage/${1}/CMakeLists.txt" || die
|
||||
}
|
||||
|
||||
_disable_plugin() {
|
||||
echo > "${S%/}/plugin/${1}/CMakeLists.txt" || die
|
||||
}
|
||||
|
||||
if use jemalloc ; then
|
||||
echo "TARGET_LINK_LIBRARIES(mysqld jemalloc)" >> "${S}/sql/CMakeLists.txt" || die
|
||||
fi
|
||||
if use tcmalloc; then
|
||||
echo "TARGET_LINK_LIBRARIES(mysqld tcmalloc)" >> "${S}/sql/CMakeLists.txt" || die
|
||||
fi
|
||||
# Remove the centos and rhel selinux policies to support mysqld_safe under SELinux
|
||||
if [[ -d "${S}/support-files/SELinux" ]] ; then
|
||||
echo > "${S}/support-files/SELinux/CMakeLists.txt" || die
|
||||
fi
|
||||
|
||||
if use libressl ; then
|
||||
sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \
|
||||
"${S}/cmake/ssl.cmake" || die
|
||||
fi
|
||||
|
||||
sed -i 's~ADD_SUBDIRECTORY(storage/ndb)~~' CMakeLists.txt || die
|
||||
|
||||
local plugin
|
||||
local server_plugins=( semisync )
|
||||
local test_plugins=( audit_null daemon_example fulltext )
|
||||
if ! use server; then # These plugins are for the server
|
||||
for plugin in "${server_plugins[@]}" ; do
|
||||
_disable_plugin "${plugin}"
|
||||
done
|
||||
fi
|
||||
|
||||
if ! use test; then # These plugins are only used during testing
|
||||
for plugin in "${test_plugins[@]}" ; do
|
||||
_disable_plugin "${plugin}"
|
||||
done
|
||||
fi
|
||||
|
||||
# Don't build example
|
||||
_disable_engine example
|
||||
_disable_engine ndb
|
||||
_disable_plugin innodb_memcached
|
||||
|
||||
cmake-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure(){
|
||||
# bug 508724 mariadb cannot use ld.gold
|
||||
tc-ld-disable-gold
|
||||
# Bug #114895, bug #110149
|
||||
filter-flags "-O" "-O[01]"
|
||||
|
||||
append-cxxflags -felide-constructors
|
||||
|
||||
# bug #283926, with GCC4.4, this is required to get correct behavior.
|
||||
append-flags -fno-strict-aliasing
|
||||
|
||||
CMAKE_BUILD_TYPE="RelWithDebInfo"
|
||||
|
||||
# debug hack wrt #497532
|
||||
mycmakeargs=(
|
||||
-DCMAKE_C_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
|
||||
-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="$(usex debug '' '-DNDEBUG')"
|
||||
-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
|
||||
-DMYSQL_DATADIR="${EPREFIX}/var/lib/mysql"
|
||||
-DSYSCONFDIR="${EPREFIX}/etc/mysql"
|
||||
-DINSTALL_BINDIR=bin
|
||||
-DINSTALL_DOCDIR=share/doc/${PF}
|
||||
-DINSTALL_DOCREADMEDIR=share/doc/${PF}
|
||||
-DINSTALL_INCLUDEDIR=include/mysql
|
||||
-DINSTALL_INFODIR=share/info
|
||||
-DINSTALL_LIBDIR=$(get_libdir)
|
||||
-DINSTALL_MANDIR=share/man
|
||||
-DINSTALL_MYSQLSHAREDIR=share/mysql
|
||||
-DINSTALL_PLUGINDIR=$(get_libdir)/mysql/plugin
|
||||
-DINSTALL_SCRIPTDIR=share/mysql/scripts
|
||||
-DINSTALL_MYSQLDATADIR="${EPREFIX}/var/lib/mysql"
|
||||
-DINSTALL_SBINDIR=sbin
|
||||
-DINSTALL_SUPPORTFILESDIR="${EPREFIX}/usr/share/mysql"
|
||||
-DCOMPILATION_COMMENT="Gentoo Linux ${PF}"
|
||||
-DWITH_UNIT_TESTS=$(usex test ON OFF)
|
||||
### TODO: make this system but issues with UTF-8 prevent it
|
||||
-DWITH_EDITLINE=bundled
|
||||
-DWITH_ZLIB=system
|
||||
-DWITH_LIBWRAP=0
|
||||
-DENABLED_LOCAL_INFILE=1
|
||||
-DMYSQL_UNIX_ADDR="${EPREFIX}/var/run/mysqld/mysqld.sock"
|
||||
-DWITH_DEFAULT_COMPILER_OPTIONS=0
|
||||
-DWITH_DEFAULT_FEATURE_SET=0
|
||||
# The build forces this to be defined when cross-compiling. We pass it
|
||||
# all the time for simplicity and to make sure it is actually correct.
|
||||
-DSTACK_DIRECTION=$(tc-stack-grows-down && echo -1 || echo 1)
|
||||
-DWITH_LIBEVENT=NO
|
||||
-DWITHOUT_CLIENTLIBS=YES
|
||||
-DENABLE_DTRACE=$(usex systemtap)
|
||||
-DWITH_SSL=$(usex yassl bundled system)
|
||||
-DINSTALL_MYSQLTESTDIR=$(usex test 'share/mysql/mysql-test' '')
|
||||
-DWITHOUT_VALIDATE_PASSWORD=1
|
||||
)
|
||||
|
||||
if use server ; then
|
||||
|
||||
if [[ ( -n ${MYSQL_DEFAULT_CHARSET} ) && ( -n ${MYSQL_DEFAULT_COLLATION} ) ]]; then
|
||||
ewarn "You are using a custom charset of ${MYSQL_DEFAULT_CHARSET}"
|
||||
ewarn "and a collation of ${MYSQL_DEFAULT_COLLATION}."
|
||||
ewarn "You MUST file bugs without these variables set."
|
||||
|
||||
mycmakeargs+=(
|
||||
-DDEFAULT_CHARSET=${MYSQL_DEFAULT_CHARSET}
|
||||
-DDEFAULT_COLLATION=${MYSQL_DEFAULT_COLLATION}
|
||||
)
|
||||
|
||||
elif ! use latin1 ; then
|
||||
mycmakeargs+=(
|
||||
-DDEFAULT_CHARSET=utf8
|
||||
-DDEFAULT_COLLATION=utf8_general_ci
|
||||
)
|
||||
else
|
||||
mycmakeargs+=(
|
||||
-DDEFAULT_CHARSET=latin1
|
||||
-DDEFAULT_COLLATION=latin1_swedish_ci
|
||||
)
|
||||
fi
|
||||
mycmakeargs+=(
|
||||
-DWITH_NUMA=$(usex numa ON OFF)
|
||||
-DEXTRA_CHARSETS=all
|
||||
-DDISABLE_SHARED=$(usex static YES NO)
|
||||
-DWITH_DEBUG=$(usex debug)
|
||||
-DWITH_EMBEDDED_SERVER=OFF
|
||||
)
|
||||
|
||||
if use profiling ; then
|
||||
# Setting to OFF doesn't work: Once set, profiling options will be added
|
||||
# to `mysqld --help` output via sql/sys_vars.cc causing
|
||||
# "main.mysqld--help-notwin" test to fail
|
||||
mycmakeargs+=( -DENABLED_PROFILING=ON )
|
||||
fi
|
||||
|
||||
if use static; then
|
||||
mycmakeargs+=( -DWITH_PIC=1 )
|
||||
fi
|
||||
|
||||
# Storage engines
|
||||
mycmakeargs+=(
|
||||
-DWITH_ARCHIVE_STORAGE_ENGINE=1
|
||||
-DWITH_BLACKHOLE_STORAGE_ENGINE=1
|
||||
-DWITH_CSV_STORAGE_ENGINE=1
|
||||
-DWITH_HEAP_STORAGE_ENGINE=1
|
||||
-DWITH_INNOBASE_STORAGE_ENGINE=1
|
||||
-DWITH_MYISAMMRG_STORAGE_ENGINE=1
|
||||
-DWITH_MYISAM_STORAGE_ENGINE=1
|
||||
-DWITH_PARTITION_STORAGE_ENGINE=1
|
||||
-DWITH_INNODB_MEMCACHED=0
|
||||
)
|
||||
|
||||
else
|
||||
mycmakeargs+=(
|
||||
-DWITHOUT_SERVER=1
|
||||
-DWITH_EMBEDDED_SERVER=OFF
|
||||
-DEXTRA_CHARSETS=none
|
||||
)
|
||||
fi
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
cmake-utils_src_compile
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
# Kill old libmysqclient_r symlinks if they exist. Time to fix what depends on them.
|
||||
find "${D}" -name 'libmysqlclient_r.*' -type l -delete || die
|
||||
# Make sure the vars are correctly initialized
|
||||
mysql_init_vars
|
||||
|
||||
# Convenience links
|
||||
einfo "Making Convenience links for mysqlcheck multi-call binary"
|
||||
dosym "mysqlcheck" "/usr/bin/mysqlanalyze"
|
||||
dosym "mysqlcheck" "/usr/bin/mysqlrepair"
|
||||
dosym "mysqlcheck" "/usr/bin/mysqloptimize"
|
||||
|
||||
# INSTALL_LAYOUT=STANDALONE causes cmake to create a /usr/data dir
|
||||
if [[ -d "${ED}/usr/data" ]] ; then
|
||||
rm -Rf "${ED}/usr/data" || die
|
||||
fi
|
||||
|
||||
# Unless they explicitly specific USE=test, then do not install the
|
||||
# testsuite. It DOES have a use to be installed, esp. when you want to do a
|
||||
# validation of your database configuration after tuning it.
|
||||
if ! use test ; then
|
||||
rm -rf "${D}/${MY_SHAREDSTATEDIR}/mysql-test"
|
||||
fi
|
||||
|
||||
# Configuration stuff
|
||||
einfo "Building default configuration ..."
|
||||
insinto "${MY_SYSCONFDIR#${EPREFIX}}"
|
||||
[[ -f "${S%/}/scripts/mysqlaccess.conf" ]] && doins "${S%/}"/scripts/mysqlaccess.conf
|
||||
local mycnf_src="my.cnf-5.6"
|
||||
sed -e "s!@DATADIR@!${MY_DATADIR}!g" \
|
||||
"${FILESDIR%/}/${mycnf_src}" \
|
||||
> "${TMPDIR%/}/my.cnf.ok" || die
|
||||
use prefix && sed -i -r -e '/^user[[:space:]]*=[[:space:]]*mysql$/d' "${TMPDIR%/}/my.cnf.ok"
|
||||
if use latin1 ; then
|
||||
sed -i \
|
||||
-e "/character-set/s|utf8|latin1|g" \
|
||||
"${TMPDIR%/}/my.cnf.ok" || die
|
||||
fi
|
||||
eprefixify "${TMPDIR%/}/my.cnf.ok"
|
||||
newins "${TMPDIR}/my.cnf.ok" my.cnf
|
||||
|
||||
if use server ; then
|
||||
einfo "Including support files and sample configurations"
|
||||
docinto "support-files"
|
||||
local script
|
||||
for script in \
|
||||
"${S}"/support-files/magic
|
||||
do
|
||||
[[ -f "$script" ]] && dodoc "${script}"
|
||||
done
|
||||
|
||||
docinto "scripts"
|
||||
for script in "${S}"/scripts/mysql* ; do
|
||||
[[ ( -f "$script" ) && ( "${script%.sh}" == "${script}" ) ]] && dodoc "${script}"
|
||||
done
|
||||
fi
|
||||
|
||||
#Remove mytop if perl is not selected
|
||||
[[ -e "${ED}/usr/bin/mytop" ]] && ! use perl && rm -f "${ED}/usr/bin/mytop"
|
||||
}
|
||||
|
||||
# Official test instructions:
|
||||
# USE='perl server static-libs' \
|
||||
# FEATURES='test userpriv -usersandbox' \
|
||||
# ebuild mysql-X.X.XX.ebuild \
|
||||
# digest clean package
|
||||
src_test() {
|
||||
|
||||
_disable_test() {
|
||||
local rawtestname reason
|
||||
rawtestname="${1}" ; shift
|
||||
reason="${@}"
|
||||
ewarn "test '${rawtestname}' disabled: '${reason}'"
|
||||
echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
|
||||
}
|
||||
|
||||
local TESTDIR="${BUILD_DIR}/mysql-test"
|
||||
local retstatus_unit
|
||||
local retstatus_tests
|
||||
|
||||
if ! use server ; then
|
||||
einfo "Skipping server tests due to minimal build."
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Bug #213475 - MySQL _will_ object strenously if your machine is named
|
||||
# localhost. Also causes weird failures.
|
||||
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
|
||||
|
||||
if [[ $UID -eq 0 ]]; then
|
||||
die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
|
||||
fi
|
||||
has usersandbox $FEATURES && ewarn "Some tests may fail with FEATURES=usersandbox"
|
||||
|
||||
einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
|
||||
|
||||
# Run CTest (test-units)
|
||||
cmake-utils_src_test
|
||||
retstatus_unit=$?
|
||||
|
||||
# Ensure that parallel runs don't die
|
||||
export MTR_BUILD_THREAD="$((${RANDOM} % 100))"
|
||||
# Enable parallel testing, auto will try to detect number of cores
|
||||
# You may set this by hand.
|
||||
# The default maximum is 8 unless MTR_MAX_PARALLEL is increased
|
||||
export MTR_PARALLEL="${MTR_PARALLEL:-auto}"
|
||||
|
||||
# create directories because mysqladmin might run out of order
|
||||
mkdir -p "${T}"/var-tests{,/log} || die
|
||||
|
||||
# Run mysql tests
|
||||
pushd "${TESTDIR}" > /dev/null || die
|
||||
|
||||
touch "${T}/disabled.def"
|
||||
# These are failing in MySQL 5.6 for now and are believed to be
|
||||
# false positives:
|
||||
#
|
||||
local t
|
||||
|
||||
for t in auth_sec.keyring_udf federated.federated_plugin ; do
|
||||
_disable_test "$t" "False positives in Gentoo"
|
||||
done
|
||||
|
||||
# Bad test definition
|
||||
_disable_test main.mysqldump "Test fails after 2018-12-31 with new warnings"
|
||||
|
||||
# run mysql-test tests
|
||||
perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
|
||||
retstatus_tests=$?
|
||||
|
||||
popd > /dev/null || die
|
||||
|
||||
# Cleanup is important for these testcases.
|
||||
pkill -9 -f "${S}/ndb" 2>/dev/null
|
||||
pkill -9 -f "${S}/sql" 2>/dev/null
|
||||
|
||||
local failures=""
|
||||
[[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit"
|
||||
[[ $retstatus_tests -eq 0 ]] || failures="${failures} tests"
|
||||
|
||||
[[ -z "$failures" ]] || die "Test failures: $failures"
|
||||
einfo "Tests successfully completed"
|
||||
}
|
||||
|
||||
mysql_init_vars() {
|
||||
MY_SHAREDSTATEDIR=${MY_SHAREDSTATEDIR="${EPREFIX%/}/usr/share/mysql"}
|
||||
MY_SYSCONFDIR=${MY_SYSCONFDIR="${EPREFIX%/}/etc/mysql"}
|
||||
MY_LOCALSTATEDIR=${MY_LOCALSTATEDIR="${EPREFIX%/}/var/lib/mysql"}
|
||||
MY_LOGDIR=${MY_LOGDIR="${EPREFIX%/}/var/log/mysql"}
|
||||
|
||||
if [[ -z "${MY_DATADIR}" ]] ; then
|
||||
MY_DATADIR=""
|
||||
if [[ -f "${MY_SYSCONFDIR}/my.cnf" ]] ; then
|
||||
MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
|
||||
| sed -ne '/datadir/s|^--datadir=||p' \
|
||||
| tail -n1`
|
||||
if [[ -z "${MY_DATADIR}" ]] ; then
|
||||
MY_DATADIR=`grep ^datadir "${MY_SYSCONFDIR}/my.cnf" \
|
||||
| sed -e 's/.*=\s*//' \
|
||||
| tail -n1`
|
||||
fi
|
||||
fi
|
||||
if [[ -z "${MY_DATADIR}" ]] ; then
|
||||
MY_DATADIR="${MY_LOCALSTATEDIR}"
|
||||
einfo "Using default MY_DATADIR"
|
||||
fi
|
||||
elog "MySQL MY_DATADIR is ${MY_DATADIR}"
|
||||
|
||||
if [[ -z "${PREVIOUS_DATADIR}" ]] ; then
|
||||
if [[ -e "${MY_DATADIR}" ]] ; then
|
||||
# If you get this and you're wondering about it, see bug #207636
|
||||
elog "MySQL datadir found in ${MY_DATADIR}"
|
||||
elog "A new one will not be created."
|
||||
PREVIOUS_DATADIR="yes"
|
||||
else
|
||||
PREVIOUS_DATADIR="no"
|
||||
fi
|
||||
export PREVIOUS_DATADIR
|
||||
fi
|
||||
else
|
||||
if [[ ${EBUILD_PHASE} == "config" ]]; then
|
||||
local new_MY_DATADIR
|
||||
new_MY_DATADIR=`"my_print_defaults" mysqld 2>/dev/null \
|
||||
| sed -ne '/datadir/s|^--datadir=||p' \
|
||||
| tail -n1`
|
||||
|
||||
if [[ ( -n "${new_MY_DATADIR}" ) && ( "${new_MY_DATADIR}" != "${MY_DATADIR}" ) ]]; then
|
||||
ewarn "MySQL MY_DATADIR has changed"
|
||||
ewarn "from ${MY_DATADIR}"
|
||||
ewarn "to ${new_MY_DATADIR}"
|
||||
MY_DATADIR="${new_MY_DATADIR}"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
export MY_SHAREDSTATEDIR MY_SYSCONFDIR
|
||||
export MY_LOCALSTATEDIR MY_LOGDIR
|
||||
export MY_DATADIR
|
||||
}
|
||||
|
||||
pkg_config() {
|
||||
_getoptval() {
|
||||
local mypd="${EROOT%/}"/usr/bin/my_print_defaults
|
||||
local section="$1"
|
||||
local flag="--${2}="
|
||||
local extra_options="${3}"
|
||||
"${mypd}" $extra_options $section | sed -n "/^${flag}/s,${flag},,gp"
|
||||
}
|
||||
local old_MY_DATADIR="${MY_DATADIR}"
|
||||
local old_HOME="${HOME}"
|
||||
# my_print_defaults needs to read stuff in $HOME/.my.cnf
|
||||
export HOME=${EPREFIX%/}/root
|
||||
|
||||
# Make sure the vars are correctly initialized
|
||||
mysql_init_vars
|
||||
|
||||
[[ -z "${MY_DATADIR}" ]] && die "Sorry, unable to find MY_DATADIR"
|
||||
if [[ ! -x "${EROOT%/}/usr/sbin/mysqld" ]] ; then
|
||||
die "Minimal builds do NOT include the MySQL server"
|
||||
fi
|
||||
|
||||
if [[ ( -n "${MY_DATADIR}" ) && ( "${MY_DATADIR}" != "${old_MY_DATADIR}" ) ]]; then
|
||||
local MY_DATADIR_s="${ROOT%/}/${MY_DATADIR}"
|
||||
MY_DATADIR_s="${MY_DATADIR_s%%/}"
|
||||
local old_MY_DATADIR_s="${ROOT%/}/${old_MY_DATADIR}"
|
||||
old_MY_DATADIR_s="${old_MY_DATADIR_s%%/}"
|
||||
|
||||
if [[ ( -d "${old_MY_DATADIR_s}" ) && ( "${old_MY_DATADIR_s}" != / ) ]]; then
|
||||
if [[ -d "${MY_DATADIR_s}" ]]; then
|
||||
ewarn "Both ${old_MY_DATADIR_s} and ${MY_DATADIR_s} exist"
|
||||
ewarn "Attempting to use ${MY_DATADIR_s} and preserving ${old_MY_DATADIR_s}"
|
||||
else
|
||||
elog "Moving MY_DATADIR from ${old_MY_DATADIR_s} to ${MY_DATADIR_s}"
|
||||
mv --strip-trailing-slashes -T "${old_MY_DATADIR_s}" "${MY_DATADIR_s}" \
|
||||
|| die "Moving MY_DATADIR failed"
|
||||
fi
|
||||
else
|
||||
ewarn "Previous MY_DATADIR (${old_MY_DATADIR_s}) does not exist"
|
||||
if [[ -d "${MY_DATADIR_s}" ]]; then
|
||||
ewarn "Attempting to use ${MY_DATADIR_s}"
|
||||
else
|
||||
eerror "New MY_DATADIR (${MY_DATADIR_s}) does not exist"
|
||||
die "Configuration Failed! Please reinstall ${CATEGORY}/${PN}"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
local pwd1="a"
|
||||
local pwd2="b"
|
||||
local maxtry=15
|
||||
|
||||
if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
|
||||
local tmp_mysqld_password_source=
|
||||
|
||||
for tmp_mysqld_password_source in mysql client; do
|
||||
einfo "Trying to get password for mysql 'root' user from '${tmp_mysqld_password_source}' section ..."
|
||||
MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password)"
|
||||
if [[ -n "${MYSQL_ROOT_PASSWORD}" ]]; then
|
||||
if [[ ${MYSQL_ROOT_PASSWORD} == *$'\n'* ]]; then
|
||||
ewarn "Ignoring password from '${tmp_mysqld_password_source}' section due to newline character (do you have multiple password options set?)!"
|
||||
MYSQL_ROOT_PASSWORD=
|
||||
continue
|
||||
fi
|
||||
|
||||
einfo "Found password in '${tmp_mysqld_password_source}' section!"
|
||||
break
|
||||
fi
|
||||
done
|
||||
|
||||
# Sometimes --show is required to display passwords in some implementations of my_print_defaults
|
||||
if [[ "${MYSQL_ROOT_PASSWORD}" == '*****' ]]; then
|
||||
MYSQL_ROOT_PASSWORD="$(_getoptval "${tmp_mysqld_password_source}" password --show)"
|
||||
fi
|
||||
|
||||
unset tmp_mysqld_password_source
|
||||
fi
|
||||
MYSQL_TMPDIR="$(_getoptval mysqld tmpdir)"
|
||||
# These are dir+prefix
|
||||
MYSQL_RELAY_LOG="$(_getoptval mysqld relay-log)"
|
||||
MYSQL_RELAY_LOG=${MYSQL_RELAY_LOG%/*}
|
||||
MYSQL_LOG_BIN="$(_getoptval mysqld log-bin)"
|
||||
MYSQL_LOG_BIN=${MYSQL_LOG_BIN%/*}
|
||||
|
||||
if [[ ! -d "${EROOT%/}/$MYSQL_TMPDIR" ]]; then
|
||||
einfo "Creating MySQL tmpdir $MYSQL_TMPDIR"
|
||||
install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_TMPDIR"
|
||||
fi
|
||||
if [[ ! -d "${EROOT%/}/$MYSQL_LOG_BIN" ]]; then
|
||||
einfo "Creating MySQL log-bin directory $MYSQL_LOG_BIN"
|
||||
install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_LOG_BIN"
|
||||
fi
|
||||
if [[ ! -d "${EROOT%/}/$MYSQL_RELAY_LOG" ]]; then
|
||||
einfo "Creating MySQL relay-log directory $MYSQL_RELAY_LOG"
|
||||
install -d -m 770 -o mysql -g mysql "${EROOT%/}/$MYSQL_RELAY_LOG"
|
||||
fi
|
||||
|
||||
if [[ -d "${ROOT%/}/${MY_DATADIR}/mysql" ]] ; then
|
||||
ewarn "You have already a MySQL database in place."
|
||||
ewarn "(${ROOT%/}/${MY_DATADIR}/*)"
|
||||
ewarn "Please rename or delete it if you wish to replace it."
|
||||
die "MySQL database already exists!"
|
||||
fi
|
||||
|
||||
# Bug #213475 - MySQL _will_ object strenously if your machine is named
|
||||
# localhost. Also causes weird failures.
|
||||
[[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost"
|
||||
|
||||
if [ -z "${MYSQL_ROOT_PASSWORD}" ]; then
|
||||
|
||||
einfo "Please provide a password for the mysql 'root' user now"
|
||||
einfo "or through the ${HOME}/.my.cnf file."
|
||||
ewarn "Avoid [\"'\\_%] characters in the password"
|
||||
read -rsp " >" pwd1 ; echo
|
||||
|
||||
einfo "Retype the password"
|
||||
read -rsp " >" pwd2 ; echo
|
||||
|
||||
if [[ "x$pwd1" != "x$pwd2" ]] ; then
|
||||
die "Passwords are not the same"
|
||||
fi
|
||||
MYSQL_ROOT_PASSWORD="${pwd1}"
|
||||
unset pwd1 pwd2
|
||||
fi
|
||||
|
||||
local options
|
||||
local sqltmp="$(emktemp)"
|
||||
|
||||
# Fix bug 446200. Don't reference host my.cnf, needs to come first,
|
||||
# see http://bugs.mysql.com/bug.php?id=31312
|
||||
use prefix && options="${options} '--defaults-file=${MY_SYSCONFDIR}/my.cnf'"
|
||||
|
||||
local help_tables="${EROOT%/}${MY_SHAREDSTATEDIR}/fill_help_tables.sql"
|
||||
[[ -r "${help_tables}" ]] \
|
||||
&& cp "${help_tables}" "${TMPDIR}/fill_help_tables.sql" \
|
||||
|| touch "${TMPDIR}/fill_help_tables.sql"
|
||||
help_tables="${TMPDIR}/fill_help_tables.sql"
|
||||
|
||||
# Figure out which options we need to disable to do the setup
|
||||
local helpfile="${TMPDIR%/}/mysqld-help"
|
||||
"${EROOT%/}/usr/sbin/mysqld" --verbose --help >"${helpfile}" 2>/dev/null
|
||||
for opt in host-cache name-resolve networking slave-start \
|
||||
federated ssl log-bin relay-log slow-query-log external-locking \
|
||||
log-slave-updates \
|
||||
; do
|
||||
optexp="--(skip-)?${opt}" optfull="--loose-skip-${opt}"
|
||||
egrep -sq -- "${optexp}" "${helpfile}" && options="${options} ${optfull}"
|
||||
done
|
||||
|
||||
einfo "Creating the mysql database and setting proper permissions on it ..."
|
||||
|
||||
# Now that /var/run is a tmpfs mount point, we need to ensure it exists before using it
|
||||
PID_DIR="${EROOT%/}/var/run/mysqld"
|
||||
if [[ ! -d "${PID_DIR}" ]]; then
|
||||
install -d -m 755 -o mysql -g mysql "${PID_DIR}" || die "Could not create pid directory"
|
||||
fi
|
||||
|
||||
if [[ ! -d "${MY_DATADIR}" ]]; then
|
||||
install -d -m 750 -o mysql -g mysql "${MY_DATADIR}" || die "Could not create data directory"
|
||||
fi
|
||||
|
||||
pushd "${TMPDIR}" &>/dev/null || die
|
||||
|
||||
# Filling timezones, see
|
||||
# http://dev.mysql.com/doc/mysql/en/time-zone-support.html
|
||||
"${EROOT%/}/usr/bin/mysql_tzinfo_to_sql" "${EROOT%/}/usr/share/zoneinfo" >> "${sqltmp}" 2>/dev/null
|
||||
chown mysql "${sqltmp}" || die
|
||||
|
||||
local cmd=( "${EROOT%/}/usr/share/mysql/scripts/mysql_install_db" )
|
||||
[[ -f "${cmd}" ]] || cmd=( "${EROOT%/}/usr/bin/mysql_install_db" )
|
||||
if [[ -r "${help_tables}" ]] ; then
|
||||
cat "${help_tables}" >> "${sqltmp}"
|
||||
fi
|
||||
cmd+=( "--basedir=${EPREFIX%/}/usr" ${options} "--datadir=${ROOT%/}${MY_DATADIR}" "--tmpdir=${ROOT%/}${MYSQL_TMPDIR}" )
|
||||
einfo "Command: ${cmd[*]}"
|
||||
su -s /bin/sh -c "${cmd[*]}" mysql \
|
||||
>"${TMPDIR%/}"/mysql_install_db.log 2>&1
|
||||
if [ $? -ne 0 ]; then
|
||||
grep -B5 -A999 -i "ERROR" "${TMPDIR%/}"/mysql_install_db.log 1>&2
|
||||
die "Failed to initialize mysqld. Please review ${EPREFIX%/}/var/log/mysql/mysqld.err AND ${TMPDIR%/}/mysql_install_db.log"
|
||||
fi
|
||||
popd &>/dev/null || die
|
||||
[[ -f "${ROOT%/}/${MY_DATADIR}/mysql/user.frm" ]] \
|
||||
|| die "MySQL databases not installed"
|
||||
|
||||
use prefix || options="${options} --user=mysql"
|
||||
|
||||
local socket="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.sock"
|
||||
local pidfile="${EROOT%/}/var/run/mysqld/mysqld${RANDOM}.pid"
|
||||
local mysqld="${EROOT%/}/usr/sbin/mysqld \
|
||||
${options} \
|
||||
$(use prefix || echo --user=mysql) \
|
||||
--log-warnings=0 \
|
||||
--basedir=${EROOT%/}/usr \
|
||||
--datadir=${ROOT%/}/${MY_DATADIR} \
|
||||
--max_allowed_packet=8M \
|
||||
--net_buffer_length=16K \
|
||||
--socket=${socket} \
|
||||
--pid-file=${pidfile} \
|
||||
--tmpdir=${ROOT}/${MYSQL_TMPDIR}"
|
||||
#einfo "About to start mysqld: ${mysqld}"
|
||||
ebegin "Starting mysqld"
|
||||
einfo "Command ${mysqld}"
|
||||
${mysqld} &
|
||||
rc=$?
|
||||
while ! [[ -S "${socket}" || "${maxtry}" -lt 1 ]] ; do
|
||||
maxtry=$((${maxtry}-1))
|
||||
echo -n "."
|
||||
sleep 1
|
||||
done
|
||||
eend $rc
|
||||
|
||||
if ! [[ -S "${socket}" ]]; then
|
||||
die "Completely failed to start up mysqld with: ${mysqld}"
|
||||
fi
|
||||
|
||||
ebegin "Setting root password"
|
||||
# Do this from memory, as we don't want clear text passwords in temp files
|
||||
local sql="SET PASSWORD FOR 'root'@'localhost' = PASSWORD('${MYSQL_ROOT_PASSWORD}');"
|
||||
"${EROOT%/}/usr/bin/mysql" \
|
||||
--no-defaults \
|
||||
"--socket=${socket}" \
|
||||
-hlocalhost \
|
||||
-e "${sql}"
|
||||
eend $?
|
||||
|
||||
if [[ -n "${sqltmp}" ]] ; then
|
||||
ebegin "Loading \"zoneinfo\", this step may require a few seconds"
|
||||
"${EROOT%/}/usr/bin/mysql" \
|
||||
--socket="${socket}" \
|
||||
-hlocalhost \
|
||||
-uroot \
|
||||
--password="${MYSQL_ROOT_PASSWORD}" \
|
||||
mysql < "${sqltmp}"
|
||||
rc=$?
|
||||
eend $?
|
||||
[[ $rc -ne 0 ]] && ewarn "Failed to load zoneinfo!"
|
||||
fi
|
||||
|
||||
# Stop the server and cleanup
|
||||
einfo "Stopping the server ..."
|
||||
kill $(< "${pidfile}" )
|
||||
rm -f "${sqltmp}"
|
||||
wait %1
|
||||
einfo "Done"
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,4 +1,4 @@
|
||||
DIST nss-3.40.1.tar.gz 23311074 BLAKE2B 9cd723e983a3f70748b0734bb2a6cc1ddfa280f1c167c3b1b371a58900fb3d9b3bf3482293bb8614d39ffb538bcca815a2aedbe03d2d643731817452f82bc2ca SHA512 464ae843161e8deb911975d2117e8bf1194a968689b4ce70f9a12d5a33dba7ddd69f1248ec45244139c30fcc87678b206a4e124f032b26ead8bf894e4e8d0564
|
||||
DIST nss-3.41.tar.gz 23319563 BLAKE2B 76636b704cd572f9b840c7699c29697a4a882e66afcc3895ceb7b59a7af7af2513074e1abc6a028a13126d44e0cf722ab29e52a4c69640a2247814292efa282d SHA512 b5a43fe86ded664002fd714c493d9222a64539cd6139b64720625d1742fec5100712cbe401c90c79196e9cbad9ec07d9b4f0f517ce34e4b207beaa3e01c9e114
|
||||
DIST nss-3.42.tar.gz 23416008 BLAKE2B 4aaf31fbc13b57ef438cfd8ee0c42a681af6939c707a51a25cb551c120221a5b37b1471926e75920dc2a53466d2f47599973b6f53175d7e952b49527bf3f34a6 SHA512 ad22f4b2672b4f29c7dd5544cbb642d3ec4b451137ffde4f608ff7b9826c762caa885f4802e1df291d2067a291aae9ffa1cf7298af96e1c6afa019fc7c3935bd
|
||||
DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
|
||||
DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2
|
||||
|
||||
@ -1,371 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal
|
||||
|
||||
NSPR_VER="4.16"
|
||||
RTM_NAME="NSS_${PV//./_}_RTM"
|
||||
# Rev of https://git.fedorahosted.org/cgit/nss-pem.git
|
||||
PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116"
|
||||
PEM_P="${PN}-pem-20160329"
|
||||
|
||||
DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
|
||||
HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/"
|
||||
SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
|
||||
cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch )
|
||||
nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )"
|
||||
|
||||
LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="cacert +nss-pem utils"
|
||||
CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
|
||||
>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]"
|
||||
DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
|
||||
>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
|
||||
${CDEPEND}"
|
||||
RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
|
||||
${CDEPEND}
|
||||
"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
S="${WORKDIR}/${P}/${PN}"
|
||||
|
||||
MULTILIB_CHOST_TOOLS=(
|
||||
/usr/bin/nss-config
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
# Custom changes for gentoo
|
||||
"${FILESDIR}/${PN}-3.32-gentoo-fixups.patch"
|
||||
"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
|
||||
"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
|
||||
)
|
||||
|
||||
src_unpack() {
|
||||
unpack ${A}
|
||||
if use nss-pem ; then
|
||||
mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
if use nss-pem ; then
|
||||
PATCHES+=(
|
||||
"${FILESDIR}/${PN}-3.21-enable-pem.patch"
|
||||
)
|
||||
fi
|
||||
if use cacert ; then #521462
|
||||
PATCHES+=(
|
||||
"${DISTDIR}/${PN}-cacert-class1-class3.patch"
|
||||
)
|
||||
fi
|
||||
|
||||
default
|
||||
|
||||
pushd coreconf >/dev/null || die
|
||||
# hack nspr paths
|
||||
echo 'INCLUDES += -I$(DIST)/include/dbm' \
|
||||
>> headers.mk || die "failed to append include"
|
||||
|
||||
# modify install path
|
||||
sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
|
||||
-i source.mk || die
|
||||
|
||||
# Respect LDFLAGS
|
||||
sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
|
||||
popd >/dev/null || die
|
||||
|
||||
# Fix pkgconfig file for Prefix
|
||||
sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
|
||||
config/Makefile || die
|
||||
|
||||
# use host shlibsign if need be #436216
|
||||
if tc-is-cross-compiler ; then
|
||||
sed -i \
|
||||
-e 's:"${2}"/shlibsign:shlibsign:' \
|
||||
cmd/shlibsign/sign.sh || die
|
||||
fi
|
||||
|
||||
# dirty hack
|
||||
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
|
||||
lib/ssl/config.mk || die
|
||||
sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
|
||||
cmd/platlibs.mk || die
|
||||
|
||||
multilib_copy_sources
|
||||
|
||||
strip-flags
|
||||
}
|
||||
|
||||
multilib_src_configure() {
|
||||
# Ensure we stay multilib aware
|
||||
sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
|
||||
}
|
||||
|
||||
nssarch() {
|
||||
# Most of the arches are the same as $ARCH
|
||||
local t=${1:-${CHOST}}
|
||||
case ${t} in
|
||||
aarch64*)echo "aarch64";;
|
||||
hppa*) echo "parisc";;
|
||||
i?86*) echo "i686";;
|
||||
x86_64*) echo "x86_64";;
|
||||
*) tc-arch ${t};;
|
||||
esac
|
||||
}
|
||||
|
||||
nssbits() {
|
||||
local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
|
||||
if [[ ${1} == BUILD_ ]]; then
|
||||
cc=$(tc-getBUILD_CC)
|
||||
else
|
||||
cc=$(tc-getCC)
|
||||
fi
|
||||
echo > "${T}"/test.c || die
|
||||
${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
|
||||
case $(file "${T}/${1}test.o") in
|
||||
*32-bit*x86-64*) echo USE_X32=1;;
|
||||
*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
|
||||
*32-bit*|*ppc*|*i386*) ;;
|
||||
*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
|
||||
esac
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
# use ABI to determine bit'ness, or fallback if unset
|
||||
local buildbits mybits
|
||||
case "${ABI}" in
|
||||
n32) mybits="USE_N32=1";;
|
||||
x32) mybits="USE_X32=1";;
|
||||
s390x|*64) mybits="USE_64=1";;
|
||||
${DEFAULT_ABI})
|
||||
einfo "Running compilation test to determine bit'ness"
|
||||
mybits=$(nssbits)
|
||||
;;
|
||||
esac
|
||||
# bitness of host may differ from target
|
||||
if tc-is-cross-compiler; then
|
||||
buildbits=$(nssbits BUILD_)
|
||||
fi
|
||||
|
||||
local makeargs=(
|
||||
CC="$(tc-getCC)"
|
||||
CCC="$(tc-getCXX)"
|
||||
AR="$(tc-getAR) rc \$@"
|
||||
RANLIB="$(tc-getRANLIB)"
|
||||
OPTIMIZER=
|
||||
${mybits}
|
||||
)
|
||||
|
||||
# Take care of nspr settings #436216
|
||||
local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
|
||||
unset NSPR_INCLUDE_DIR
|
||||
|
||||
# Do not let `uname` be used.
|
||||
if use kernel_linux ; then
|
||||
makeargs+=(
|
||||
OS_TARGET=Linux
|
||||
OS_RELEASE=2.6
|
||||
OS_TEST="$(nssarch)"
|
||||
)
|
||||
fi
|
||||
|
||||
export NSS_ENABLE_WERROR=0 #567158
|
||||
export BUILD_OPT=1
|
||||
export NSS_USE_SYSTEM_SQLITE=1
|
||||
export NSDISTMODE=copy
|
||||
export NSS_ENABLE_ECC=1
|
||||
export FREEBL_NO_DEPEND=1
|
||||
export ASFLAGS=""
|
||||
|
||||
local d
|
||||
|
||||
# Build the host tools first.
|
||||
LDFLAGS="${BUILD_LDFLAGS}" \
|
||||
XCFLAGS="${BUILD_CFLAGS}" \
|
||||
NSPR_LIB_DIR="${T}/fakedir" \
|
||||
emake -j1 -C coreconf \
|
||||
CC="$(tc-getBUILD_CC)" \
|
||||
${buildbits:-${mybits}}
|
||||
makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
|
||||
|
||||
# Then build the target tools.
|
||||
for d in . lib/dbm ; do
|
||||
CPPFLAGS="${myCPPFLAGS}" \
|
||||
XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
|
||||
NSPR_LIB_DIR="${T}/fakedir" \
|
||||
emake -j1 "${makeargs[@]}" -C ${d}
|
||||
done
|
||||
}
|
||||
|
||||
# Altering these 3 libraries breaks the CHK verification.
|
||||
# All of the following cause it to break:
|
||||
# - stripping
|
||||
# - prelink
|
||||
# - ELF signing
|
||||
# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
|
||||
# Either we have to NOT strip them, or we have to forcibly resign after
|
||||
# stripping.
|
||||
#local_libdir="$(get_libdir)"
|
||||
#export STRIP_MASK="
|
||||
# */${local_libdir}/libfreebl3.so*
|
||||
# */${local_libdir}/libnssdbm3.so*
|
||||
# */${local_libdir}/libsoftokn3.so*"
|
||||
|
||||
export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
|
||||
|
||||
generate_chk() {
|
||||
local shlibsign="$1"
|
||||
local libdir="$2"
|
||||
einfo "Resigning core NSS libraries for FIPS validation"
|
||||
shift 2
|
||||
local i
|
||||
for i in ${NSS_CHK_SIGN_LIBS} ; do
|
||||
local libname=lib${i}.so
|
||||
local chkname=lib${i}.chk
|
||||
"${shlibsign}" \
|
||||
-i "${libdir}"/${libname} \
|
||||
-o "${libdir}"/${chkname}.tmp \
|
||||
&& mv -f \
|
||||
"${libdir}"/${chkname}.tmp \
|
||||
"${libdir}"/${chkname} \
|
||||
|| die "Failed to sign ${libname}"
|
||||
done
|
||||
}
|
||||
|
||||
cleanup_chk() {
|
||||
local libdir="$1"
|
||||
shift 1
|
||||
local i
|
||||
for i in ${NSS_CHK_SIGN_LIBS} ; do
|
||||
local libfname="${libdir}/lib${i}.so"
|
||||
# If the major version has changed, then we have old chk files.
|
||||
[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
|
||||
&& rm -f "${libfname}.chk"
|
||||
done
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
pushd dist >/dev/null || die
|
||||
|
||||
dodir /usr/$(get_libdir)
|
||||
cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed"
|
||||
local i
|
||||
for i in crmf freebl nssb nssckfw ; do
|
||||
cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed"
|
||||
done
|
||||
|
||||
# Install nss-config and pkgconfig file
|
||||
dodir /usr/bin
|
||||
cp -L */bin/nss-config "${ED%/}"/usr/bin || die
|
||||
dodir /usr/$(get_libdir)/pkgconfig
|
||||
cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die
|
||||
|
||||
# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
|
||||
# bug 517266
|
||||
sed -e 's#Libs:#Libs: -lfreebl#' \
|
||||
-e 's#Cflags:#Cflags: -I${includedir}/private#' \
|
||||
*/lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
|
||||
|| die "could not create nss-softokn.pc"
|
||||
|
||||
# all the include files
|
||||
insinto /usr/include/nss
|
||||
doins public/nss/*.{h,api}
|
||||
insinto /usr/include/nss/private
|
||||
doins private/nss/{blapi,alghmac}.h
|
||||
|
||||
popd >/dev/null || die
|
||||
|
||||
local f nssutils
|
||||
# Always enabled because we need it for chk generation.
|
||||
nssutils=( shlibsign )
|
||||
|
||||
if multilib_is_native_abi ; then
|
||||
if use utils; then
|
||||
# The tests we do not need to install.
|
||||
#nssutils_test="bltest crmftest dbtest dertimetest
|
||||
#fipstest remtest sdrtest"
|
||||
# checkcert utils has been removed in nss-3.22:
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
|
||||
# https://hg.mozilla.org/projects/nss/rev/df1729d37870
|
||||
# certcgi has been removed in nss-3.36:
|
||||
# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
|
||||
nssutils+=(
|
||||
addbuiltin
|
||||
atob
|
||||
baddbdir
|
||||
btoa
|
||||
certutil
|
||||
cmsutil
|
||||
conflict
|
||||
crlutil
|
||||
derdump
|
||||
digest
|
||||
makepqg
|
||||
mangle
|
||||
modutil
|
||||
multinit
|
||||
nonspr10
|
||||
ocspclnt
|
||||
oidcalc
|
||||
p7content
|
||||
p7env
|
||||
p7sign
|
||||
p7verify
|
||||
pk11mode
|
||||
pk12util
|
||||
pp
|
||||
rsaperf
|
||||
selfserv
|
||||
signtool
|
||||
signver
|
||||
ssltap
|
||||
strsclnt
|
||||
symkeyutil
|
||||
tstclnt
|
||||
vfychain
|
||||
vfyserv
|
||||
)
|
||||
# install man-pages for utils (bug #516810)
|
||||
doman doc/nroff/*.1
|
||||
fi
|
||||
pushd dist/*/bin >/dev/null || die
|
||||
for f in ${nssutils[@]}; do
|
||||
dobin ${f}
|
||||
done
|
||||
popd >/dev/null || die
|
||||
fi
|
||||
|
||||
# Prelink breaks the CHK files. We don't have any reliable way to run
|
||||
# shlibsign after prelink.
|
||||
dodir /etc/prelink.conf.d
|
||||
printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \
|
||||
> "${ED%/}"/etc/prelink.conf.d/nss.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
multilib_pkg_postinst() {
|
||||
# We must re-sign the libraries AFTER they are stripped.
|
||||
local shlibsign="${EROOT}/usr/bin/shlibsign"
|
||||
# See if we can execute it (cross-compiling & such). #436216
|
||||
"${shlibsign}" -h >&/dev/null
|
||||
if [[ $? -gt 1 ]] ; then
|
||||
shlibsign="shlibsign"
|
||||
fi
|
||||
generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
|
||||
}
|
||||
|
||||
multilib_foreach_abi multilib_pkg_postinst
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
multilib_pkg_postrm() {
|
||||
cleanup_chk "${EROOT}"/usr/$(get_libdir)
|
||||
}
|
||||
|
||||
multilib_foreach_abi multilib_pkg_postrm
|
||||
}
|
||||
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST cachetools-2.1.0.tar.gz 20051 BLAKE2B 87c0839352a82fa2e531c6e4fe4da3ea7038ab9f09ce0b537f16deebf63de36a49ffd563790d42a1f07962841cf07431f1287de114f9e8d148c1413eedf1ff42 SHA512 6536afae48bad99465709860fd57c8c66d3b203ecf79a922e117a2c004a33b7ab2ac895f87596cbf4be377f6655d1deddc80b6500daa4d529eef7c1ca0adbd8d
|
||||
DIST cachetools-3.0.0.tar.gz 20513 BLAKE2B e6fdfe2aff22a9ae35d19acb7a678410c5c06d3147cfc3d57725d942c3e4ce00d5aa8bfce7f8ee80960751643bc655d5d2226382e82c1c5c1eda746cb34a556a SHA512 7211e4d1525b94f5a74a89571a1a3696719d1cb15246f4b8158408082cc59ef03935ba82ddd78a34dbb31b271c234dab6cd82839c13b23159b80264bd552bc51
|
||||
DIST cachetools-3.1.0.tar.gz 20664 BLAKE2B acb9ecdc1a9ca4bfdea7b9f593aedd6c8db9f96c703b71fb3007ec6e255d4d99d53c22f6b61ba25d53ac9a3bdee8de7303d18ba05115017bd6ee63c2bacf1fca SHA512 1d03cf42b56857ccc1203a658a8c70fa3c0a3be2ecfa3b9501c14ba674463d4ffccf8a8a9daee13084545a5072ecd7757174a4b074d33b0619020f7ec89515bc
|
||||
|
||||
@ -0,0 +1,26 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} pypy )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Extensible memoizing collections and decorators"
|
||||
HOMEPAGE="https://pypi.org/project/cachetools/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="${RDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
|
||||
|
||||
python_test() {
|
||||
py.test -v || die "Tests failed under ${EPYTHON}"
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,54 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit gnome2-utils readme.gentoo-r1 xdg
|
||||
|
||||
DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
|
||||
HOMEPAGE="http://www.jetbrains.com/pycharm/"
|
||||
SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND=">=virtual/jre-1.8
|
||||
dev-python/pip"
|
||||
|
||||
RESTRICT="mirror strip"
|
||||
|
||||
QA_PREBUILT="opt/${PN}/bin/fsnotifier
|
||||
opt/${PN}/bin/fsnotifier64
|
||||
opt/${PN}/bin/fsnotifier-arm"
|
||||
|
||||
MY_PN=${PN/-community/}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
rm -rf jre || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /opt/${PN}
|
||||
doins -r *
|
||||
|
||||
fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
|
||||
|
||||
dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
|
||||
newicon bin/${MY_PN}.png ${PN}.png
|
||||
make_desktop_entry ${PN} ${PN} ${PN}
|
||||
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_pkg_postrm
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -0,0 +1,57 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit gnome2-utils readme.gentoo-r1 xdg
|
||||
|
||||
DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
|
||||
HOMEPAGE="http://www.jetbrains.com/pycharm/"
|
||||
SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
|
||||
|
||||
LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND=">=virtual/jre-1.8
|
||||
dev-python/pip"
|
||||
|
||||
RESTRICT="mirror strip"
|
||||
|
||||
QA_PREBUILT="opt/${PN}/bin/fsnotifier
|
||||
opt/${PN}/bin/fsnotifier64
|
||||
opt/${PN}/bin/fsnotifier-arm
|
||||
opt/${PN}/bin/libyjpagent-linux.so
|
||||
opt/${PN}/bin/libyjpagent-linux64.so"
|
||||
|
||||
MY_PN=${PN/-professional/}
|
||||
S="${WORKDIR}/${MY_PN}-${PV}"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
rm -rf jre || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /opt/${PN}
|
||||
doins -r *
|
||||
|
||||
fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
|
||||
|
||||
dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
|
||||
newicon bin/${MY_PN}.png ${PN}.png
|
||||
make_desktop_entry ${PN} ${PN} ${PN}
|
||||
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_pkg_postinst
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_pkg_postrm
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,78 @@
|
||||
From 5a6449c3b3d9bbc2b1bc15a5d5b40d7228f3a406 Mon Sep 17 00:00:00 2001
|
||||
From: Dominik Haumann <dhaumann@kde.org>
|
||||
Date: Wed, 30 Jan 2019 17:16:32 +0100
|
||||
Subject: Fix bug 403422: Allow changing the marker size again
|
||||
|
||||
This bug was introduced with https://phabricator.kde.org/D17661
|
||||
with commit c287d3858fd780f5e139d05e8bb7d4558ccc71b8
|
||||
|
||||
FIXED-IN: 5.55
|
||||
BUG: 403422
|
||||
---
|
||||
src/dialogs/textareaappearanceconfigwidget.ui | 27 +++++++++++++++++++++------
|
||||
1 file changed, 21 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/dialogs/textareaappearanceconfigwidget.ui b/src/dialogs/textareaappearanceconfigwidget.ui
|
||||
index 02a0d54..cc44a39 100644
|
||||
--- a/src/dialogs/textareaappearanceconfigwidget.ui
|
||||
+++ b/src/dialogs/textareaappearanceconfigwidget.ui
|
||||
@@ -185,10 +185,10 @@
|
||||
<string>Size of the visible highlight marker.</string>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
- <number>-1</number>
|
||||
+ <number>1</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
- <number>-1</number>
|
||||
+ <number>5</number>
|
||||
</property>
|
||||
<property name="singleStep">
|
||||
<number>1</number>
|
||||
@@ -301,6 +301,21 @@ beginning of a file.</string>
|
||||
<header>kcombobox.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
+ <tabstops>
|
||||
+ <tabstop>gbWordWrap</tabstop>
|
||||
+ <tabstop>chkDynWrapAtStaticMarker</tabstop>
|
||||
+ <tabstop>cmbDynamicWordWrapIndicator</tabstop>
|
||||
+ <tabstop>sbDynamicWordWrapDepth</tabstop>
|
||||
+ <tabstop>chkShowTabs</tabstop>
|
||||
+ <tabstop>chkShowSpaces</tabstop>
|
||||
+ <tabstop>sliSetMarkerSize</tabstop>
|
||||
+ <tabstop>chkShowIndentationLines</tabstop>
|
||||
+ <tabstop>chkShowWholeBracketExpression</tabstop>
|
||||
+ <tabstop>chkAnimateBracketMatching</tabstop>
|
||||
+ <tabstop>chkFoldFirstLine</tabstop>
|
||||
+ <tabstop>chkShowWordCount</tabstop>
|
||||
+ <tabstop>chkShowLineCount</tabstop>
|
||||
+ </tabstops>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
@@ -314,8 +329,8 @@ beginning of a file.</string>
|
||||
<y>7</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
- <x>340</x>
|
||||
- <y>44</y>
|
||||
+ <x>559</x>
|
||||
+ <y>117</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
@@ -330,8 +345,8 @@ beginning of a file.</string>
|
||||
<y>6</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
- <x>385</x>
|
||||
- <y>72</y>
|
||||
+ <x>559</x>
|
||||
+ <y>162</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
@ -0,0 +1,57 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
VIRTUALX_REQUIRED="test"
|
||||
inherit kde5
|
||||
|
||||
DESCRIPTION="Framework providing a full text editor component"
|
||||
LICENSE="LGPL-2+"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
IUSE="editorconfig git"
|
||||
|
||||
RDEPEND="
|
||||
$(add_frameworks_dep karchive)
|
||||
$(add_frameworks_dep kauth)
|
||||
$(add_frameworks_dep kcodecs)
|
||||
$(add_frameworks_dep kcompletion)
|
||||
$(add_frameworks_dep kconfig)
|
||||
$(add_frameworks_dep kconfigwidgets)
|
||||
$(add_frameworks_dep kcoreaddons)
|
||||
$(add_frameworks_dep kguiaddons)
|
||||
$(add_frameworks_dep ki18n)
|
||||
$(add_frameworks_dep kiconthemes)
|
||||
$(add_frameworks_dep kio)
|
||||
$(add_frameworks_dep kitemviews)
|
||||
$(add_frameworks_dep kjobwidgets)
|
||||
$(add_frameworks_dep kparts)
|
||||
$(add_frameworks_dep ktextwidgets)
|
||||
$(add_frameworks_dep kwidgetsaddons)
|
||||
$(add_frameworks_dep kxmlgui)
|
||||
$(add_frameworks_dep sonnet)
|
||||
$(add_frameworks_dep syntax-highlighting)
|
||||
$(add_qt_dep qtdeclarative)
|
||||
$(add_qt_dep qtgui)
|
||||
$(add_qt_dep qtprintsupport)
|
||||
$(add_qt_dep qtwidgets)
|
||||
$(add_qt_dep qtxml)
|
||||
editorconfig? ( app-text/editorconfig-core-c )
|
||||
git? ( dev-libs/libgit2:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? ( $(add_frameworks_dep kservice) )
|
||||
"
|
||||
|
||||
RESTRICT+=" test"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-allow-change-marker-size.patch" )
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_find_package editorconfig EditorConfig)
|
||||
$(cmake-utils_use_find_package git LibGit2)
|
||||
)
|
||||
|
||||
kde5_src_configure
|
||||
}
|
||||
@ -0,0 +1,88 @@
|
||||
From dc901a1f0b5f6621bfa1c23e33dcfdf6246e7cb1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Kre=C5=A1imir=20=C4=8Cohar?= <kcohar@gmail.com>
|
||||
Date: Thu, 10 Jan 2019 09:19:33 -0700
|
||||
Subject: [KWidgetsAddons] Do not use light font styles for headings (3/3)
|
||||
|
||||
Summary:
|
||||
This patch brings back regular font styles for headings to KTitleWidget for the sake of consistency with QML and Kirigami, where they were also reintroduced in favor of better legibility.
|
||||
|
||||
CCBUG: 402730
|
||||
|
||||
FIXED-IN: 5.54
|
||||
|
||||
Test Plan:
|
||||
Before:
|
||||
{F6520054}
|
||||
After:
|
||||
{F6520058}
|
||||
|
||||
Reviewers: ngraham, #frameworks, #vdg, #plasma
|
||||
|
||||
Reviewed By: ngraham, #vdg
|
||||
|
||||
Subscribers: cfeck, filipf, kde-frameworks-devel
|
||||
|
||||
Tags: #frameworks
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D17907
|
||||
---
|
||||
src/ktitlewidget.cpp | 29 -----------------------------
|
||||
1 file changed, 29 deletions(-)
|
||||
|
||||
diff --git a/src/ktitlewidget.cpp b/src/ktitlewidget.cpp
|
||||
index 7a34bc2..d8b0517 100644
|
||||
--- a/src/ktitlewidget.cpp
|
||||
+++ b/src/ktitlewidget.cpp
|
||||
@@ -213,16 +213,6 @@ void KTitleWidget::changeEvent(QEvent *e)
|
||||
if (e->type() == QEvent::PaletteChange || e->type() == QEvent::FontChange
|
||||
|| e->type() == QEvent::ApplicationFontChange) {
|
||||
d->textLabel->setStyleSheet(d->textStyleSheet());
|
||||
- //Qt stylesheet doesn't support lighter font-weight
|
||||
- QFont font(d->textLabel->font());
|
||||
- if (d->level <= 4) {
|
||||
- font.setWeight(QFont::Light);
|
||||
- font.setStyleName(QStringLiteral("Light"));
|
||||
- } else {
|
||||
- font.setWeight(QFont::Normal);
|
||||
- font.setStyleName(QStringLiteral("Regular"));
|
||||
- }
|
||||
- d->textLabel->setFont(font);
|
||||
d->commentLabel->setStyleSheet(d->commentStyleSheet());
|
||||
}
|
||||
}
|
||||
@@ -233,16 +223,6 @@ void KTitleWidget::setText(const QString &text, Qt::Alignment alignment)
|
||||
|
||||
if (!Qt::mightBeRichText(text)) {
|
||||
d->textLabel->setStyleSheet(d->textStyleSheet());
|
||||
- //Qt stylesheet doesn't support lighter font-weight
|
||||
- QFont font(d->textLabel->font());
|
||||
- if (d->level <= 4) {
|
||||
- font.setWeight(QFont::Light);
|
||||
- font.setStyleName(QStringLiteral("Light"));
|
||||
- } else {
|
||||
- font.setWeight(QFont::Normal);
|
||||
- font.setStyleName(QStringLiteral("Regular"));
|
||||
- }
|
||||
- d->textLabel->setFont(font);
|
||||
}
|
||||
|
||||
d->textLabel->setText(text);
|
||||
@@ -259,15 +239,6 @@ void KTitleWidget::setLevel(int level)
|
||||
d->level = level;
|
||||
|
||||
d->textLabel->setStyleSheet(d->textStyleSheet());
|
||||
- //Qt stylesheet doesn't support lighter font-weight
|
||||
- QFont font(d->textLabel->font());
|
||||
- if (d->level <= 4) {
|
||||
- font.setWeight(QFont::Light);
|
||||
- font.setStyleName(QStringLiteral("Light"));
|
||||
- } else {
|
||||
- font.setWeight(QFont::Normal);
|
||||
- font.setStyleName(QStringLiteral("Regular"));
|
||||
- }
|
||||
}
|
||||
|
||||
int KTitleWidget::level()
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
VIRTUALX_REQUIRED="test"
|
||||
inherit kde5
|
||||
|
||||
DESCRIPTION="An assortment of high-level widgets for common tasks"
|
||||
LICENSE="LGPL-2.1+"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
IUSE="nls"
|
||||
|
||||
RDEPEND="
|
||||
$(add_qt_dep qtgui)
|
||||
$(add_qt_dep qtwidgets)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( $(add_qt_dep linguist-tools) )
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-no-light-fontstyle-headings.patch" )
|
||||
|
||||
src_test() {
|
||||
# bug 650216, 653186
|
||||
local myctestargs=( -E "(kdatecomboboxtest|ktooltipwidgettest)" )
|
||||
kde5_src_test
|
||||
}
|
||||
@ -0,0 +1,79 @@
|
||||
From 02b523bad09aab062355e46771889b0f3709692f Mon Sep 17 00:00:00 2001
|
||||
From: Albert Astals Cid <aacid@kde.org>
|
||||
Date: Sat, 12 Jan 2019 18:39:33 +0100
|
||||
Subject: Make KCheckAccelerators less invasive for apps that don't directly
|
||||
link to KXmlGui
|
||||
|
||||
Summary: BUGS: 337491
|
||||
|
||||
Test Plan:
|
||||
Ran qtcreator and it no longer has the & in Details
|
||||
Added some debug and checked that okular still gets the code called
|
||||
|
||||
Reviewers: anthonyfieroni
|
||||
|
||||
Reviewed By: anthonyfieroni
|
||||
|
||||
Subscribers: davidedmundson, anthonyfieroni, kde-frameworks-devel
|
||||
|
||||
Tags: #frameworks
|
||||
|
||||
Differential Revision: https://phabricator.kde.org/D18204
|
||||
---
|
||||
src/kcheckaccelerators.cpp | 38 ++++++++++++++++++++++++++++++++++++--
|
||||
1 file changed, 36 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/kcheckaccelerators.cpp b/src/kcheckaccelerators.cpp
|
||||
index 13fc012..e08447d 100644
|
||||
--- a/src/kcheckaccelerators.cpp
|
||||
+++ b/src/kcheckaccelerators.cpp
|
||||
@@ -80,10 +80,44 @@ public Q_SLOTS:
|
||||
|
||||
static void startupFunc()
|
||||
{
|
||||
- // Call initiateIfNeeded once we're in the event loop
|
||||
- // This is to prevent using KSharedConfig before main() can set the app name
|
||||
+ // Static because in some cases this is called multiple times
|
||||
+ // but if an application had any of the bad cases we always want
|
||||
+ // to skip the check
|
||||
+ static bool doCheckAccelerators = true;
|
||||
+
|
||||
+ if (!doCheckAccelerators) {
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
QCoreApplication *app = QCoreApplication::instance();
|
||||
+ if (!app) {
|
||||
+ // We're being loaded by something that doesn't have a QCoreApplication
|
||||
+ // this would probably crash at some later point since we do use qApp->
|
||||
+ // quite a lot, so skip the magic
|
||||
+ doCheckAccelerators = false;
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (!QCoreApplication::startingUp()) {
|
||||
+ // If the app has already started, this means we're not being run as part of
|
||||
+ // qt_call_pre_routines, which most probably means that we're being run as part
|
||||
+ // of KXmlGui being loaded as part of some plugin of the app, so don't
|
||||
+ // do any magic
|
||||
+ doCheckAccelerators = false;
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (!QCoreApplication::eventDispatcher()) {
|
||||
+ // We are called with event dispatcher being null when KXmlGui is being loaded
|
||||
+ // through plasma-integration instead of being linked to the app (i.e. QtCreator vs Okular)
|
||||
+ // For apps that don't link directly to KXmlGui do not do the accelerator magic
|
||||
+ doCheckAccelerators = false;
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
KCheckAcceleratorsInitializer *initializer = new KCheckAcceleratorsInitializer(app);
|
||||
+ // Call initiateIfNeeded once we're in the event loop
|
||||
+ // This is to prevent using KSharedConfig before main() can set the app name
|
||||
QMetaObject::invokeMethod(initializer, "initiateIfNeeded", Qt::QueuedConnection);
|
||||
}
|
||||
|
||||
--
|
||||
cgit v1.1
|
||||
|
||||
@ -0,0 +1,54 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
VIRTUALX_REQUIRED="test"
|
||||
inherit kde5
|
||||
|
||||
DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
LICENSE="LGPL-2+"
|
||||
IUSE="attica"
|
||||
|
||||
# slot op: includes QtCore/private/qlocale_p.h
|
||||
RDEPEND="
|
||||
$(add_frameworks_dep kconfig)
|
||||
$(add_frameworks_dep kconfigwidgets)
|
||||
$(add_frameworks_dep kcoreaddons)
|
||||
$(add_frameworks_dep kglobalaccel)
|
||||
$(add_frameworks_dep ki18n)
|
||||
$(add_frameworks_dep kiconthemes)
|
||||
$(add_frameworks_dep kitemviews)
|
||||
$(add_frameworks_dep ktextwidgets)
|
||||
$(add_frameworks_dep kwidgetsaddons)
|
||||
$(add_frameworks_dep kwindowsystem)
|
||||
$(add_qt_dep qtcore '' '' '5=')
|
||||
$(add_qt_dep qtdbus)
|
||||
$(add_qt_dep qtgui)
|
||||
$(add_qt_dep qtnetwork 'ssl')
|
||||
$(add_qt_dep qtprintsupport)
|
||||
$(add_qt_dep qtwidgets)
|
||||
$(add_qt_dep qtxml)
|
||||
attica? ( $(add_frameworks_dep attica) )
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-kcheckaccelerators.patch" )
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_find_package attica KF5Attica)
|
||||
)
|
||||
|
||||
kde5_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Files are missing; whatever. Bugs 650290, 668198
|
||||
local myctestargs=(
|
||||
-E "(ktoolbar_unittest|kxmlgui_unittest)"
|
||||
)
|
||||
|
||||
kde5_src_test
|
||||
}
|
||||
Binary file not shown.
@ -1,2 +1 @@
|
||||
DIST basket-2.49a_p20170225.tar.gz 4680129 BLAKE2B f6a7acc8b83596815a79f9dd73879f9471d2a9ae9096d521ef98faeaaa2f3f2c6dc46c05ed0097fa1b20cf66479b5127b625eb60b0257fb1579bfc1d73f2e989 SHA512 87d454d33bfa881ac5958a4d02c5775b8d54e83c6b86e1b2732565132b2d0339be630a3ab0bbd0169da950aa43750e4088add45a94ce10fd3ffa05e0b3e26b1c
|
||||
DIST basket-2.49a_p20181205.tar.gz 4689215 BLAKE2B dce87001622aac8e50957d87d36c9094a807765d96bc60fe450fed0f293e0e21ead7529c57eaecc97c4f56d5bce7fabd34a564f632fc56f0c83621fac4092dee SHA512 62c6a337f634be374ee8631c8b88a78097ae4badd905e6be556f11fa841cc03ab32ab563f59a865d1bc85f105ec273472734c42f1bff834e4d7219c258d82281
|
||||
|
||||
@ -1,72 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
COMMIT="8de0345d99f3eb08d9406bd07e88b31afe46f315"
|
||||
KDE_TEST="true"
|
||||
KDE_HANDBOOK="forceoptional"
|
||||
VIRTUALX_REQUIRED="test"
|
||||
inherit kde5 vcs-snapshot
|
||||
|
||||
DESCRIPTION="A DropDrawers clone. Multiple information organizer"
|
||||
HOMEPAGE="https://github.com/basket-notepads/basket"
|
||||
SRC_URI="https://github.com/${PN}-notepads/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="amd64 x86"
|
||||
IUSE="crypt git"
|
||||
|
||||
RDEPEND="
|
||||
$(add_frameworks_dep karchive)
|
||||
$(add_frameworks_dep kcmutils)
|
||||
$(add_frameworks_dep kcodecs)
|
||||
$(add_frameworks_dep kcompletion)
|
||||
$(add_frameworks_dep kconfig)
|
||||
$(add_frameworks_dep kconfigwidgets)
|
||||
$(add_frameworks_dep kcoreaddons)
|
||||
$(add_frameworks_dep kcrash)
|
||||
$(add_frameworks_dep kdbusaddons)
|
||||
$(add_frameworks_dep kfilemetadata)
|
||||
$(add_frameworks_dep kglobalaccel)
|
||||
$(add_frameworks_dep kguiaddons)
|
||||
$(add_frameworks_dep ki18n)
|
||||
$(add_frameworks_dep kiconthemes)
|
||||
$(add_frameworks_dep kio)
|
||||
$(add_frameworks_dep knotifications)
|
||||
$(add_frameworks_dep kparts)
|
||||
$(add_frameworks_dep kservice)
|
||||
$(add_frameworks_dep ktextwidgets)
|
||||
$(add_frameworks_dep kwidgetsaddons)
|
||||
$(add_frameworks_dep kwindowsystem)
|
||||
$(add_frameworks_dep kxmlgui)
|
||||
$(add_qt_dep qtdbus)
|
||||
$(add_qt_dep qtgui)
|
||||
$(add_qt_dep qtnetwork)
|
||||
$(add_qt_dep qtwidgets)
|
||||
$(add_qt_dep qtxml)
|
||||
media-libs/phonon[qt5(+)]
|
||||
x11-libs/libX11
|
||||
crypt? ( app-crypt/gpgme:= )
|
||||
git? ( dev-libs/libgit2:= )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
$(add_qt_dep qtconcurrent)
|
||||
"
|
||||
|
||||
PATCHES=( "${FILESDIR}/${P}-fixes.patch" )
|
||||
|
||||
src_prepare() {
|
||||
kde5_src_prepare
|
||||
if ! use test; then
|
||||
sed -e "/add_subdirectory(tests/s/^/#DONT/" -i src/CMakeLists.txt || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_find_package crypt Gpgme)
|
||||
$(cmake-utils_use_find_package git Libgit2)
|
||||
)
|
||||
kde5_src_configure
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
From 26e8fe568123cc957ea500c4b747f44fa8193edc Mon Sep 17 00:00:00 2001
|
||||
From: Gleb Baryshev <gleb.baryshev@gmail.com>
|
||||
Date: Sun, 13 Aug 2017 21:37:52 +0300
|
||||
Subject: [PATCH] Fix KF5 issues
|
||||
|
||||
#33 Library has wrong versioning (libbasketcommon.so.SOVERSION)
|
||||
#34 Translations are not properly used
|
||||
#35 Documentation still requires kdelibs4support for dtd/ktex.dtd
|
||||
---
|
||||
CMakeLists.txt | 3 +++
|
||||
doc/en/index.docbook | 4 ++--
|
||||
src/CMakeLists.txt | 4 ++--
|
||||
3 files changed, 7 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2997365e..7b54ace3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -92,6 +92,9 @@ ENDIF(GPGME_FOUND)
|
||||
|
||||
#TODO: find meinproc
|
||||
|
||||
+#Make libbasketcommon search for translations in basket.mo
|
||||
+ADD_DEFINITIONS(-DTRANSLATION_DOMAIN=\"basket\")
|
||||
+
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
|
||||
index ddef489a..586014e8 100644
|
||||
--- a/doc/en/index.docbook
|
||||
+++ b/doc/en/index.docbook
|
||||
@@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
|
||||
+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [
|
||||
<!ENTITY basket "<application>BasKet</application>">
|
||||
<!ENTITY % addindex "IGNORE">
|
||||
<!ENTITY % English "INCLUDE" > <!-- change language only here -->
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 9ea886d5..f4cf523f 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -59,7 +59,7 @@ IF(HAVE_BALOO)
|
||||
list(INSERT basketcommon_LIB_SRCS 10 nepomukintegration.cpp)
|
||||
ENDIF(HAVE_BALOO)
|
||||
|
||||
-qt5_wrap_ui(basket_FORM_HDRS passwordlayout.ui basketproperties.ui settings_versionsync.ui)
|
||||
+ki18n_wrap_ui(basket_FORM_HDRS passwordlayout.ui basketproperties.ui settings_versionsync.ui)
|
||||
|
||||
QT5_ADD_DBUS_ADAPTOR(basketcommon_LIB_SRCS org.basket.BNPView.xml bnpview.h BNPView)
|
||||
|
||||
@@ -93,7 +93,7 @@ IF(HAVE_BALOO)
|
||||
target_link_libraries(basketcommon KF5::BalooFiles)
|
||||
ENDIF(HAVE_BALOO)
|
||||
|
||||
-set_target_properties(basketcommon PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
|
||||
+set_target_properties(basketcommon PROPERTIES VERSION ${Qt5Core_VERSION} SOVERSION ${Qt5Core_VERSION_MAJOR})
|
||||
|
||||
install(TARGETS basketcommon DESTINATION ${LIB_INSTALL_DIR})
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +1 @@
|
||||
DIST mlt-6.10.0.tar.gz 1384632 BLAKE2B 4bbcf95409df1ea1828d2b34e6d6663cf83f5672641034f775d029037505051c5490c46c69e104811aaf776794be2df95913d094319f4a2dbba0c42117abe15e SHA512 6f374f20f1dc851792c1075537cf7e977038fb557b2bd5d5816c1fc69d471947c8469c914cf662766f3b503ae819881bf2b4e1673e0f7a84309e0fb671a9de1b
|
||||
DIST mlt-6.12.0.tar.gz 1395646 BLAKE2B 18dc06c4075d8d51bc7f62d027adda92c359275b9ad2131cc015b4402b1b7a9438fe87b617075017b9fd5e9696b82c4c840fa6dd83188bd0cedb7f01d2158283 SHA512 ed2cc0eeda45558ae6f1ec8780dfd413641953dc12dc32dccf655649f68f8e6088d39fefb7bef7bae042a41096976004446019d82ea162785bc487009cb97680
|
||||
|
||||
@ -1,214 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
# this ebuild currently only supports installing ruby bindings for a single ruby version
|
||||
# so USE_RUBY must contain only a single value (the latest stable) as the ebuild calls
|
||||
# /usr/bin/${USE_RUBY} directly
|
||||
USE_RUBY="ruby24"
|
||||
inherit python-single-r1 ruby-single toolchain-funcs
|
||||
|
||||
DESCRIPTION="Open source multimedia framework for television broadcasting"
|
||||
HOMEPAGE="https://www.mltframework.org/"
|
||||
SRC_URI="https://github.com/mltframework/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg fftw frei0r
|
||||
gtk jack kdenlive libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
|
||||
# java perl php tcl vidstab
|
||||
IUSE="${IUSE} kernel_linux"
|
||||
|
||||
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
|
||||
|
||||
#rtaudio will use OSS on non linux OSes
|
||||
RDEPEND="
|
||||
>=media-libs/libebur128-1.2.2
|
||||
ffmpeg? (
|
||||
libav? ( >=media-video/libav-12:0=[vdpau?] )
|
||||
!libav? ( media-video/ffmpeg:0=[vdpau?] )
|
||||
)
|
||||
fftw? ( sci-libs/fftw:3.0= )
|
||||
frei0r? ( media-plugins/frei0r-plugins )
|
||||
gtk? (
|
||||
media-libs/libexif
|
||||
x11-libs/gtk+:2
|
||||
x11-libs/pango
|
||||
)
|
||||
jack? (
|
||||
>=dev-libs/libxml2-2.5
|
||||
media-libs/ladspa-sdk
|
||||
virtual/jack
|
||||
)
|
||||
libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
|
||||
lua? ( >=dev-lang/lua-5.1.4-r4:= )
|
||||
opencv? ( >=media-libs/opencv-3.2.0:= )
|
||||
opengl? ( media-video/movit )
|
||||
python? ( ${PYTHON_DEPS} )
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtsvg:5
|
||||
dev-qt/qtwidgets:5
|
||||
dev-qt/qtxml:5
|
||||
media-libs/libexif
|
||||
x11-libs/libX11
|
||||
)
|
||||
rtaudio? (
|
||||
>=media-libs/rtaudio-4.1.2
|
||||
kernel_linux? ( media-libs/alsa-lib )
|
||||
)
|
||||
ruby? ( ${RUBY_DEPS} )
|
||||
sdl? (
|
||||
media-libs/libsdl2[X,opengl,video]
|
||||
media-libs/sdl2-image
|
||||
)
|
||||
xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
|
||||
xml? ( >=dev-libs/libxml2-2.5 )"
|
||||
# java? ( >=virtual/jre-1.5 )
|
||||
# perl? ( dev-lang/perl )
|
||||
# php? ( dev-lang/php )
|
||||
# sox? ( media-sound/sox )
|
||||
# tcl? ( dev-lang/tcl:0= )
|
||||
# vidstab? ( media-libs/libvidstab )
|
||||
SWIG_DEPEND=">=dev-lang/swig-2.0"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
compressed-lumas? ( virtual/imagemagick-tools[png] )
|
||||
lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
|
||||
python? ( ${SWIG_DEPEND} )
|
||||
ruby? ( ${SWIG_DEPEND} )"
|
||||
# java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
|
||||
# perl? ( ${SWIG_DEPEND} )
|
||||
# php? ( ${SWIG_DEPEND} )
|
||||
# tcl? ( ${SWIG_DEPEND} )
|
||||
|
||||
DOCS=( AUTHORS ChangeLog NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
|
||||
|
||||
PATCHES=( "${FILESDIR}"/${P}-swig-underlinking.patch )
|
||||
|
||||
pkg_setup() {
|
||||
use python && python-single-r1_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
# respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
|
||||
for x in python lua; do
|
||||
sed -i "/mlt.so/s: -lmlt++ :& ${CFLAGS} ${LDFLAGS} :" src/swig/$x/build || die
|
||||
done
|
||||
sed -i "/^LDFLAGS/s: += :& ${LDFLAGS} :" src/swig/ruby/build || die
|
||||
|
||||
sed -i -e "s/env ruby/${USE_RUBY}/" src/swig/ruby/* || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC CXX
|
||||
|
||||
local myconf=(
|
||||
--enable-gpl
|
||||
--enable-gpl3
|
||||
--enable-motion-est
|
||||
--target-arch=$(tc-arch)
|
||||
--disable-kde
|
||||
--disable-sdl
|
||||
--disable-swfdec
|
||||
$(use_enable debug)
|
||||
$(use compressed-lumas && echo ' --luma-compress')
|
||||
$(use_enable cpu_flags_x86_sse sse)
|
||||
$(use_enable cpu_flags_x86_sse2 sse2)
|
||||
$(use_enable gtk gtk2)
|
||||
$(use_enable jack jackrack)
|
||||
$(use_enable ffmpeg avformat)
|
||||
$(use ffmpeg && echo ' --avformat-swscale')
|
||||
$(use_enable fftw plus)
|
||||
$(use_enable frei0r)
|
||||
$(use_enable melt)
|
||||
$(use_enable opencv)
|
||||
$(use_enable opengl)
|
||||
$(use_enable libsamplerate resample)
|
||||
$(use_enable rtaudio)
|
||||
$(use vdpau && echo ' --avformat-vdpau')
|
||||
$(use_enable sdl sdl2)
|
||||
$(use_enable xml)
|
||||
$(use_enable xine)
|
||||
$(use_enable kdenlive)
|
||||
--disable-sox
|
||||
)
|
||||
#$(use_enable sox) FIXME
|
||||
|
||||
if use qt5 ; then
|
||||
myconf+=(
|
||||
--enable-qt
|
||||
--qt-includedir=$(pkg-config Qt5Core --variable=includedir)
|
||||
--qt-libdir=$(pkg-config Qt5Core --variable=libdir)
|
||||
)
|
||||
else
|
||||
myconf+=( --disable-qt )
|
||||
fi
|
||||
|
||||
if use x86 || use amd64 ; then
|
||||
myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
|
||||
else
|
||||
myconf+=( --disable-mmx )
|
||||
fi
|
||||
|
||||
if ! use melt; then
|
||||
sed -i -e "s;src/melt;;" Makefile || die
|
||||
fi
|
||||
|
||||
# TODO: add swig language bindings
|
||||
# see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
|
||||
|
||||
local swig_lang
|
||||
# TODO: java perl php tcl
|
||||
for i in lua python ruby ; do
|
||||
use $i && swig_lang="${swig_lang} $i"
|
||||
done
|
||||
[[ -z "${swig_lang}" ]] && swig_lang="none"
|
||||
|
||||
econf ${myconf[@]} --swig-languages="${swig_lang}"
|
||||
|
||||
sed -i -e s/^OPT/#OPT/ "${S}/config.mak" || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
einstalldocs
|
||||
|
||||
dodir /usr/share/${PN}
|
||||
insinto /usr/share/${PN}
|
||||
doins -r demo
|
||||
|
||||
docinto swig
|
||||
|
||||
# Install SWIG bindings
|
||||
if use lua; then
|
||||
cd "${S}"/src/swig/lua || die
|
||||
exeinto $(pkg-config --variable INSTALL_CMOD lua)
|
||||
doexe mlt.so
|
||||
dodoc play.lua
|
||||
fi
|
||||
|
||||
if use python; then
|
||||
cd "${S}"/src/swig/python || die
|
||||
insinto $(python_get_sitedir)
|
||||
doins mlt.py
|
||||
exeinto $(python_get_sitedir)
|
||||
doexe _mlt.so
|
||||
dodoc play.py
|
||||
python_optimize
|
||||
fi
|
||||
|
||||
if use ruby; then
|
||||
cd "${S}"/src/swig/ruby || die
|
||||
exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
|
||||
doexe mlt.so
|
||||
dodoc play.rb thumbs.rb
|
||||
fi
|
||||
# TODO: java perl php tcl
|
||||
}
|
||||
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST kodi-pvr-mediaportal-tvserver-2.4.19.tar.gz 385817 BLAKE2B 2cd89d3940ef6a52a78be8791152715db8a55683120405eea2c42c3c58df58ac905b4f3c7aa50a6c45f8b94fe32e6d2d05811242c741a8ba7b10d8801d5d959f SHA512 d017d3d4b01fc86aaf22a1f44612e35c55b07888d8d0548cfad644d94aadedc4c86a50dd3d9c681c5e01e744971d25869f8bfa1a106c780492e4f3ee1b017e0f
|
||||
DIST kodi-pvr-mediaportal-tvserver-3.5.16.tar.gz 398113 BLAKE2B e944a49bd5d996d2c62325ec7c8b8dd6f69ca2918331cca198afbc11a1badafd4ad7ffd15f562016d540c5777cef285fcd090be28662988f71187899a43609f8 SHA512 4784b97d1826a8846156910b658a32b6b133dda04a8b2366f0dd67445fb4247132da427f63ada4284cf9889b8c5e7ca5f66785998e23b8ee5845ffdb352a83ea
|
||||
DIST kodi-pvr-mediaportal-tvserver-3.5.17.tar.gz 398338 BLAKE2B 52ed303aa236fb77bb5f79709f322b980aa29ca4e5077efc20894b610eaf81bd0d6f2a23de72bd3bf768ca0d819d57b920573515e0b134465b4f5399db966f35 SHA512 916d3a2f5ef8802a49c70f62bfb94145c3aa8f140ff3674ed3fef21c4d644a85a0cfb1088f1fc893b677635263f47455c0ffbe6554ca484659a1b7c8ebd47207
|
||||
|
||||
@ -0,0 +1,38 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit cmake-utils kodi-addon
|
||||
|
||||
DESCRIPTION="Kodi's MediaPortal TVServer client addon"
|
||||
HOMEPAGE="https://github.com/kodi-pvr/pvr.mediaportal.tvserver"
|
||||
SRC_URI=""
|
||||
|
||||
case ${PV} in
|
||||
9999)
|
||||
SRC_URI=""
|
||||
EGIT_REPO_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver.git"
|
||||
inherit git-r3
|
||||
;;
|
||||
*)
|
||||
CODENAME="Leia"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SRC_URI="https://github.com/kodi-pvr/pvr.mediaportal.tvserver/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz"
|
||||
S="${WORKDIR}/pvr.mediaportal.tvserver-${PV}-${CODENAME}"
|
||||
;;
|
||||
esac
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="
|
||||
=media-tv/kodi-18*
|
||||
=media-libs/kodi-platform-18*
|
||||
dev-libs/tinyxml
|
||||
"
|
||||
|
||||
RDEPEND="
|
||||
${DEPEND}
|
||||
"
|
||||
Binary file not shown.
@ -1,2 +1,3 @@
|
||||
DIST clementine-1.3.1_p20180416.tar.gz 8489387 BLAKE2B 37412428cf030a71f0011ba68a7ce71a3bbdc59402dc6d6349cca8ee44b208052cee9add1597a9577e5a6ed4bb2ebf16c4e1f79612d12be265f637caffd02a76 SHA512 8f38554571c637d9f79df43679ac2a76383f7a9b4ee8e921a16175889180e72afadc352dd40d73a671aa8ae9b01f6a251ae7b94b010043f8bcb8d8f42dcfff62
|
||||
DIST clementine-1.3.1_p20181201.tar.gz 8535075 BLAKE2B c4b6660ee9718054cc13c6b4fc2e1dccf9c117319f5b682dc5de2861fc40cc129e079449e1c2e15733faf14b6e18b42f37c228000a8e6c121b7fdcb2e48bc7b9 SHA512 fcc062857b95a5cabc41449143bb876df9955cdaaa59868f147d7a165dea13e2e4e1c11ea23f4309c8af7bef42d694a82867420245513af8e4dfbd91ab6f9a2c
|
||||
DIST clementine-1.3.1_p20190127.tar.gz 8516435 BLAKE2B ce884c25d76e26349cf11109f885361dd79c4d567b08927962a611a2bb17dbe6674ac176f6b09b3a8ebe14e82f30125a56ffd08ff6d2072a96ee7b9ba1f066db SHA512 b82d2dc49dbe41e68440fb421cda6989f670a2a43829bf42e21f3c07d6f6badcb217333559d6dd9c66accd88e2473e5c717969e987410bf4801669dccba7cd15
|
||||
|
||||
@ -0,0 +1,180 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PLOCALES="af ar be bg bn br bs ca cs cy da de el en en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mk_MK mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW"
|
||||
|
||||
MY_P="${P/_}"
|
||||
if [[ ${PV} == *9999* ]]; then
|
||||
EGIT_BRANCH="qt5"
|
||||
EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git"
|
||||
GIT_ECLASS="git-r3"
|
||||
else
|
||||
COMMIT=610566d25271c67d1625fd62041f6a27435b0a9d
|
||||
SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS}
|
||||
unset GIT_ECLASS
|
||||
|
||||
DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt"
|
||||
HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote"
|
||||
|
||||
REQUIRED_USE="
|
||||
udisks? ( dbus )
|
||||
wiimote? ( dbus )
|
||||
"
|
||||
|
||||
COMMON_DEPEND="
|
||||
app-crypt/qca:2[qt5(+)]
|
||||
dev-db/sqlite:=
|
||||
dev-libs/crypto++[asm]
|
||||
dev-libs/glib:2
|
||||
dev-libs/libxml2
|
||||
dev-libs/protobuf:=
|
||||
dev-qt/qtconcurrent:5
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtnetwork:5[ssl]
|
||||
dev-qt/qtsql:5[sqlite]
|
||||
dev-qt/qtwidgets:5
|
||||
media-libs/chromaprint:=
|
||||
media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0
|
||||
>=media-libs/libmygpo-qt-1.0.9[qt5(+)]
|
||||
>=media-libs/taglib-1.11.1_p20181028
|
||||
sys-libs/zlib
|
||||
virtual/glu
|
||||
x11-libs/libX11
|
||||
cdda? ( dev-libs/libcdio:= )
|
||||
dbus? ( dev-qt/qtdbus:5 )
|
||||
ipod? ( >=media-libs/libgpod-0.8.0 )
|
||||
lastfm? ( >=media-libs/liblastfm-1.1.0_pre20150206 )
|
||||
moodbar? ( sci-libs/fftw:3.0 )
|
||||
mtp? ( >=media-libs/libmtp-1.0.0 )
|
||||
projectm? (
|
||||
media-libs/glew:=
|
||||
>=media-libs/libprojectm-1.2.0
|
||||
virtual/opengl
|
||||
)
|
||||
"
|
||||
# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
|
||||
# Libprojectm-1.2 seems to work fine, so no reason to use bundled version; check clementine's patches:
|
||||
# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches
|
||||
# Still possibly essential but not applied yet patches are:
|
||||
# 06-fix-numeric-locale.patch
|
||||
# 08-stdlib.h-for-rand.patch
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
media-plugins/gst-plugins-meta:1.0
|
||||
media-plugins/gst-plugins-soup:1.0
|
||||
media-plugins/gst-plugins-taglib:1.0
|
||||
mms? ( media-plugins/gst-plugins-libmms:1.0 )
|
||||
mtp? ( gnome-base/gvfs[mtp] )
|
||||
udisks? ( sys-fs/udisks:2 )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
>=dev-cpp/gtest-1.8.0
|
||||
dev-libs/boost
|
||||
dev-qt/linguist-tools:5
|
||||
dev-qt/qtx11extras:5
|
||||
dev-qt/qtxml:5
|
||||
sys-devel/gettext
|
||||
virtual/pkgconfig
|
||||
box? ( dev-cpp/sparsehash )
|
||||
dropbox? ( dev-cpp/sparsehash )
|
||||
googledrive? ( dev-cpp/sparsehash )
|
||||
projectm? ( dev-qt/qtopengl:5 )
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
seafile? ( dev-cpp/sparsehash )
|
||||
skydrive? ( dev-cpp/sparsehash )
|
||||
test? (
|
||||
dev-qt/qttest:5
|
||||
gnome-base/gsettings-desktop-schemas
|
||||
)
|
||||
"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
S="${WORKDIR}/${PN^}-${COMMIT}"
|
||||
|
||||
DOCS=( Changelog README.md )
|
||||
|
||||
src_prepare() {
|
||||
l10n_find_plocales_changes "src/translations" "" ".po"
|
||||
|
||||
cmake-utils_src_prepare
|
||||
# some tests fail or hang
|
||||
sed -i \
|
||||
-e '/add_test_file(translations_test.cpp/d' \
|
||||
tests/CMakeLists.txt || die
|
||||
|
||||
if ! use test; then
|
||||
sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die
|
||||
cmake_comment_add_subdirectory tests
|
||||
fi
|
||||
|
||||
rm -r 3rdparty/{libmygpo-qt,libmygpo-qt5,taglib} || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# spotify is not in portage
|
||||
local mycmakeargs=(
|
||||
-DBUILD_WERROR=OFF
|
||||
# force to find crypto++ see bug #548544
|
||||
-DCRYPTOPP_LIBRARIES="cryptopp"
|
||||
-DCRYPTOPP_FOUND=ON
|
||||
# avoid automagically enabling of ccache (bug #611010)
|
||||
-DCCACHE_EXECUTABLE=OFF
|
||||
-DENABLE_BREAKPAD=OFF #< disable crash reporting
|
||||
-DENABLE_DEVICEKIT=OFF
|
||||
-DENABLE_GIO=ON
|
||||
-DENABLE_SPOTIFY_BLOB=OFF
|
||||
-DUSE_SYSTEM_GMOCK=ON
|
||||
-DUSE_SYSTEM_PROJECTM=ON
|
||||
-DBUNDLE_PROJECTM_PRESETS=OFF
|
||||
-DLINGUAS="$(l10n_get_locales)"
|
||||
-DENABLE_BOX="$(usex box)"
|
||||
-DENABLE_AUDIOCD="$(usex cdda)"
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5DBus=$(usex !dbus)
|
||||
-DENABLE_DROPBOX="$(usex dropbox)"
|
||||
-DENABLE_GOOGLE_DRIVE="$(usex googledrive)"
|
||||
-DENABLE_LIBGPOD="$(usex ipod)"
|
||||
-DENABLE_LIBLASTFM="$(usex lastfm)"
|
||||
-DENABLE_MOODBAR="$(usex moodbar)"
|
||||
-DENABLE_LIBMTP="$(usex mtp)"
|
||||
-DENABLE_VISUALISATIONS="$(usex projectm)"
|
||||
-DENABLE_SEAFILE="$(usex seafile)"
|
||||
-DENABLE_SKYDRIVE="$(usex skydrive)"
|
||||
-DENABLE_LIBPULSE="$(usex pulseaudio)"
|
||||
-DENABLE_UDISKS2="$(usex udisks)"
|
||||
-DENABLE_WIIMOTEDEV="$(usex wiimote)"
|
||||
)
|
||||
|
||||
use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
cd "${CMAKE_BUILD_DIR}" || die
|
||||
virtx emake test
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_desktop_database_update
|
||||
gnome2_icon_cache_update
|
||||
|
||||
elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
|
||||
elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
|
||||
elog "depending on your preferences"
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
Binary file not shown.
@ -1,2 +1 @@
|
||||
DIST gpac-0.6.1.tar.gz 9113143 BLAKE2B 943c09de168f7e0ce5836d5d75e670fbd651d062cf5511728867079485fcda26d984485c04cb73404d419185cd595bba18a7dae6b2f574298ebc59425b1ba62a SHA512 b1409a8ebcda08c3af504d7de591528ef84f5c3d8d506dd490502e16493de11c2435ea3f5957f39100a2ce040d5e431c86a5a203f806fcc865ae4b08f6cf5595
|
||||
DIST gpac-0.7.1.tar.gz 10654838 BLAKE2B 795fd11d6bf02bb0d27d97f2c98017e9875aae26ea7d99c5587c7ec5ccc8273283fbce6444389ff4371a34d0e7d03102982ff8a8ec014c7f0c2ddd36c684cba9 SHA512 0377d9471db9e5ccf75f85dfd0c9f4e37a211108b5e128a5411ac015bd9c906257320d517717f0fa03d434e1fce24bd8a9c3a73200fac5c21b80895b716ab403
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
Index: gpac/applications/generators/SVG/svggen.h
|
||||
===================================================================
|
||||
--- gpac.orig/applications/generators/SVG/svggen.h
|
||||
+++ gpac/applications/generators/SVG/svggen.h
|
||||
@@ -107,6 +107,17 @@ typedef struct {
|
||||
} SVGGenAttrGrp;
|
||||
|
||||
|
||||
+SVGGenAttribute *findAttribute(SVGGenElement *e, char *name);
|
||||
+void generateAttributes(FILE *output, GF_List *attributes, Bool inDefine);
|
||||
+void generateSVGCode_V1(GF_List *svg_elements);
|
||||
+void generate_laser_tables_da(GF_List *atts);
|
||||
+void generate_laser_tables(GF_List *svg_elements);
|
||||
+u32 generateCoreInfo(FILE *output, SVGGenElement *elt, u32 start);
|
||||
+u32 generateGenericInfo(FILE *output, SVGGenElement *elt, u32 index, char *pointer_root, u32 start);
|
||||
+void svgNameToImplementationName(xmlChar *svg_name, char implementation_name[50]);
|
||||
+void generate_table(GF_List *elements);
|
||||
+void generateSVGCode_V2(GF_List *svg_elements);
|
||||
+void generateSVGCode_V3(GF_List *svg_elements);
|
||||
|
||||
/*******************************************
|
||||
* Structures needed for static allocation *
|
||||
@ -1,15 +0,0 @@
|
||||
Export gf_isom_set_pixel_aspect_ratio.
|
||||
media-video/x264-encoder needs it and this funcion used to be exported.
|
||||
|
||||
diff --git a/src/isomedia/isom_write.c b/src/isomedia/isom_write.c
|
||||
index e935acc..9841d85 100644
|
||||
--- a/src/isomedia/isom_write.c
|
||||
+++ b/src/isomedia/isom_write.c
|
||||
@@ -1270,6 +1270,7 @@ GF_Err gf_isom_set_visual_info(GF_ISOFile *movie, u32 trackNumber, u32 StreamDes
|
||||
}
|
||||
}
|
||||
|
||||
+GF_EXPORT
|
||||
GF_Err gf_isom_set_pixel_aspect_ratio(GF_ISOFile *movie, u32 trackNumber, u32 StreamDescriptionIndex, u32 hSpacing, u32 vSpacing)
|
||||
{
|
||||
GF_Err e;
|
||||
@ -1,85 +0,0 @@
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 62b7850..ff4b589 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -219,7 +219,9 @@ ifeq ($(GPAC_ENST), yes)
|
||||
$(INSTALL) $(INSTFLAGS) -m 644 $(SRC_PATH)/include/gpac/enst/*.h "$(DESTDIR)$(prefix)/include/gpac/enst"
|
||||
endif
|
||||
mkdir -p "$(DESTDIR)$(prefix)/$(libdir)"
|
||||
+ifeq ($(STATICLIBS),yes)
|
||||
$(INSTALL) $(INSTFLAGS) -m 644 "./bin/gcc/libgpac_static.a" "$(DESTDIR)$(prefix)/$(libdir)"
|
||||
+endif
|
||||
$(MAKE) installdylib
|
||||
|
||||
uninstall-lib:
|
||||
diff --git a/configure b/configure
|
||||
index df00dff..561bcd3 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -101,6 +101,7 @@ has_xmlrpc="no"
|
||||
has_openjpeg="no"
|
||||
gprof_build="no"
|
||||
static_build="no"
|
||||
+static_libs="no"
|
||||
want_pic="no"
|
||||
want_gcov="no"
|
||||
has_joystick="no"
|
||||
@@ -252,6 +253,7 @@ GPAC configuration options:
|
||||
--enable-amr-wb enable AMR WB library
|
||||
--enable-amr enable both AMR NB and WB libraries
|
||||
--enable-static-bin link statically against libgpac
|
||||
+ --enable-static-lib GPAC static libraries build
|
||||
--static-mp4box configure for static linking of MP4Box only.
|
||||
--enable-depth enables depth handling in the compositor
|
||||
|
||||
@@ -1849,6 +1851,8 @@ for opt do
|
||||
;;
|
||||
--enable-static-bin) static_build="yes";
|
||||
;;
|
||||
+ --enable-static-lib) static_libs="yes";
|
||||
+ ;;
|
||||
--disable-ipv6) has_ipv6="no"
|
||||
;;
|
||||
--disable-wx) has_wx="no"
|
||||
@@ -2525,6 +2529,7 @@ echo "** GPAC $version rev$revision Core Configuration **"
|
||||
echo "debug version: $debuginfo"
|
||||
echo "GProf enabled: $gprof_build"
|
||||
echo "Static build enabled: $static_build"
|
||||
+echo "Static libs build enabled: $static_libs"
|
||||
echo "Memory tracking enabled: $use_memory_tracking"
|
||||
echo "Fixed-Point Version: $use_fixed_point"
|
||||
echo "IPV6 Support: $has_ipv6"
|
||||
@@ -3133,6 +3138,7 @@ echo "DEBUGBUILD=$debuginfo" >> config.mak
|
||||
echo "GPROFBUILD=$gprof_build" >> config.mak
|
||||
echo "MP4BOX_STATIC=$static_mp4box" >> config.mak
|
||||
echo "STATICBUILD=$static_build" >> config.mak
|
||||
+echo "STATICLIBS=$static_libs" >> config.mak
|
||||
|
||||
echo "CONFIG_IPV6=$has_ipv6" >> config.mak
|
||||
if test "$has_ipv6" = "yes" ; then
|
||||
diff --git a/src/Makefile b/src/Makefile
|
||||
index ba9d9ab..89ea67f 100644
|
||||
--- a/src/Makefile
|
||||
+++ b/src/Makefile
|
||||
@@ -610,17 +610,20 @@ compositor: $(LIBGPAC_COMPOSITOR)
|
||||
@echo "LIBS $(EXTRALIBS)"
|
||||
|
||||
ifeq ($(CONFIG_DARWIN),yes)
|
||||
-
|
||||
+ifeq ($(STATICLIBS),yes)
|
||||
$(LIBTOOL) -s -o ../bin/gcc/libgpac_static.a $(OBJS)
|
||||
$(RANLIB) ../bin/gcc/libgpac_static.a
|
||||
+endif
|
||||
ifneq ($(STATICBUILD),yes)
|
||||
$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
|
||||
endif
|
||||
|
||||
else
|
||||
|
||||
+ifeq ($(STATICLIBS),yes)
|
||||
$(AR) cr ../bin/gcc/libgpac_static.a $(OBJS)
|
||||
$(RANLIB) ../bin/gcc/libgpac_static.a
|
||||
+endif
|
||||
ifneq ($(STATICBUILD),yes)
|
||||
$(CC) $(SHFLAGS) $(LD_SONAME) $(LDFLAGS) -o $@ $(OBJS) $(EXTRALIBS)
|
||||
mv $@ $@.$(VERSION_SONAME)
|
||||
@ -1,122 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
if [[ ${PV} == *9999 ]] ; then
|
||||
SCM="git-r3"
|
||||
EGIT_REPO_URI="https://github.com/gpac/gpac"
|
||||
else
|
||||
SRC_URI="https://github.com/gpac/gpac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~x86-fbsd"
|
||||
fi
|
||||
|
||||
inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
|
||||
|
||||
DESCRIPTION="Implementation of the MPEG-4 Systems standard developed from scratch in ANSI C"
|
||||
HOMEPAGE="http://gpac.wp.mines-telecom.fr/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
|
||||
pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
|
||||
|
||||
RDEPEND="
|
||||
a52? ( media-libs/a52dec )
|
||||
aac? ( >=media-libs/faad2-2.0 )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
dvb? ( media-tv/linuxtv-dvb-apps )
|
||||
ffmpeg? (
|
||||
!libav? ( media-video/ffmpeg:0= )
|
||||
libav? ( media-video/libav:0= ) )
|
||||
jack? ( media-sound/jack-audio-connection-kit )
|
||||
jpeg? ( virtual/jpeg:0 )
|
||||
mad? ( >=media-libs/libmad-0.15.1b )
|
||||
opengl? ( virtual/opengl media-libs/freeglut virtual/glu )
|
||||
>=media-libs/libogg-1.1
|
||||
png? ( >=media-libs/libpng-1.4:0= )
|
||||
vorbis? ( >=media-libs/libvorbis-1.1 )
|
||||
theora? ( media-libs/libtheora )
|
||||
truetype? ( >=media-libs/freetype-2.1.4:2 )
|
||||
xml? ( >=dev-libs/libxml2-2.6.0:2 )
|
||||
xvid? ( >=media-libs/xvid-1.0.1 )
|
||||
sdl? ( media-libs/libsdl )
|
||||
jpeg2k? ( media-libs/openjpeg:0 )
|
||||
ssl? (
|
||||
!libressl? ( dev-libs/openssl:0= )
|
||||
libressl? ( dev-libs/libressl:0= ) )
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
X? (
|
||||
x11-libs/libXt
|
||||
x11-libs/libX11
|
||||
x11-libs/libXv
|
||||
x11-libs/libXext
|
||||
)
|
||||
"
|
||||
# disabled upstream, see applications/Makefile
|
||||
# wxwidgets? ( =x11-libs/wxGTK-2.8* )
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
my_use() {
|
||||
local flag="$1" pflag="${2:-$1}"
|
||||
if use ${flag}; then
|
||||
echo "--use-${pflag}=system"
|
||||
else
|
||||
echo "--use-${pflag}=no"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
eapply "${FILESDIR}"/110_all_implicitdecls.patch \
|
||||
"${FILESDIR}"/${PN}-0.5.3-static-libs.patch \
|
||||
"${FILESDIR}"/${PN}-0.5.2-gf_isom_set_pixel_aspect_ratio.patch
|
||||
sed -i -e "s:\(--disable-.*\)=\*):\1):" configure || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC CXX AR RANLIB
|
||||
|
||||
econf \
|
||||
--enable-svg \
|
||||
--enable-pic \
|
||||
--disable-amr \
|
||||
--use-js=no \
|
||||
--use-ogg=system \
|
||||
$(use_enable alsa) \
|
||||
$(use_enable debug) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable jack jack yes) \
|
||||
$(use_enable opengl 3d) \
|
||||
$(use_enable oss oss-audio) \
|
||||
$(use_enable pulseaudio pulseaudio yes) \
|
||||
$(use_enable sdl) \
|
||||
$(use_enable ssl) \
|
||||
$(use_enable static-libs static-lib) \
|
||||
$(use_enable X x11) $(use_enable X x11-shm) $(use_enable X x11-xv) \
|
||||
--disable-wx \
|
||||
$(my_use a52) \
|
||||
$(my_use aac faad) \
|
||||
$(my_use dvb dvbx) \
|
||||
$(my_use ffmpeg) \
|
||||
$(my_use jpeg) \
|
||||
$(my_use jpeg2k openjpeg) \
|
||||
$(my_use mad) \
|
||||
$(my_use png) \
|
||||
$(my_use theora) \
|
||||
$(my_use truetype ft) \
|
||||
$(my_use vorbis) \
|
||||
$(my_use xvid) \
|
||||
--extra-cflags="${CFLAGS}" \
|
||||
--cc="$(tc-getCC)" \
|
||||
--libdir="/$(get_libdir)" \
|
||||
--verbose
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake STRIP="true" DESTDIR="${D}" install
|
||||
emake STRIP="true" DESTDIR="${D}" install-lib
|
||||
dodoc AUTHORS BUGS Changelog README.md TODO
|
||||
dodoc doc/*.txt
|
||||
dohtml doc/*.html
|
||||
}
|
||||
Binary file not shown.
@ -1 +1 @@
|
||||
Wed, 30 Jan 2019 07:38:36 +0000
|
||||
Thu, 31 Jan 2019 05:08:36 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Wed, 30 Jan 2019 07:38:36 +0000
|
||||
Thu, 31 Jan 2019 05:08:36 +0000
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,12 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare unpack
|
||||
DEPEND=dev-libs/openssl:0 sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtmultimedia:5
|
||||
DESCRIPTION=Mt.Gox and BTC-e Bitcoin Trading Client
|
||||
EAPI=5
|
||||
HOMEPAGE=https://github.com/JulyIGHOR/QtBitcoinTrader
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=GPL-3
|
||||
RDEPEND=dev-libs/openssl:0 sys-libs/zlib dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtscript:5 dev-qt/qtwidgets:5 dev-qt/qtmultimedia:5
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/JulyIGHOR/QtBitcoinTrader/archive/v1.10.01.tar.gz -> QtBitcoinTrader-1.10.01.tar.gz
|
||||
_eclasses_=base 2ec5c64f5de125f0c65a927c4c128fef desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 fdo-mime 995b19d3f30e956b4e1bc5a91fdc4ea7 ltprune 08f9e1d9ee0af8f5d9a7854efbcd8c0e multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 qmake-utils bdf97e69a34b864d6d545f4ec3143ff7 toolchain-funcs f164325a2cdb5b3ea39311d483988861 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf vcs-snapshot b77011b62e2053c646ad720defe6d921
|
||||
_md5_=abdd74d914afa31677016c4b03a73acb
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue