parent
07b328757f
commit
3379073bda
Binary file not shown.
Binary file not shown.
@ -0,0 +1,8 @@
|
|||||||
|
# Copyright 2020 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
|
||||||
|
inherit acct-group
|
||||||
|
|
||||||
|
ACCT_GROUP_ID=427
|
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
|
<pkgmetadata>
|
||||||
|
<maintainer type="person">
|
||||||
|
<email>williamh@gentoo.org</email>
|
||||||
|
<name>William Hubbs</name>
|
||||||
|
</maintainer>
|
||||||
|
</pkgmetadata>
|
Binary file not shown.
@ -0,0 +1,12 @@
|
|||||||
|
# Copyright 2020 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
|
||||||
|
inherit acct-user
|
||||||
|
|
||||||
|
DESCRIPTION="User for cadvisor"
|
||||||
|
ACCT_USER_ID=427
|
||||||
|
ACCT_USER_GROUPS=( cadvisor )
|
||||||
|
|
||||||
|
acct-user_add_deps
|
@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||||
|
<pkgmetadata>
|
||||||
|
<maintainer type="person">
|
||||||
|
<email>williamh@gentoo.org</email>
|
||||||
|
<name>William Hubbs</name>
|
||||||
|
</maintainer>
|
||||||
|
</pkgmetadata>
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
|||||||
DIST cadvisor-0.34.0.tar.gz 5210189 BLAKE2B 48cf7ddc94e52f07a0e74868d00f4a45d45aa5233b518da46762743357c17cbe7f2971794deda9936a10c65724928a219c498bf6d2493266f5b0ea547d485cb6 SHA512 accb41afd4683413b846f9380229bfa54c88b3141be68492963444928e40e14fc28da3ce27b09746e29c4dfe6323cd6bea69181826367e830f284d6ab698c633
|
DIST cadvisor-0.34.0.tar.gz 5210189 BLAKE2B 48cf7ddc94e52f07a0e74868d00f4a45d45aa5233b518da46762743357c17cbe7f2971794deda9936a10c65724928a219c498bf6d2493266f5b0ea547d485cb6 SHA512 accb41afd4683413b846f9380229bfa54c88b3141be68492963444928e40e14fc28da3ce27b09746e29c4dfe6323cd6bea69181826367e830f284d6ab698c633
|
||||||
|
DIST cadvisor-0.35.0.tar.gz 5268930 BLAKE2B 065619ee459062bb521e855ccfd576afe236863bdc203b65e53a7eb6aec7172b6b9bb1d4183667ed36c471becb09fd974d1e4f809cf614f4d0d03ea3b87c2f63 SHA512 9fdae170fd167e0b1a2b69112ff2ec081640a144490c04e364536cae71a90e2c2845857f35af81ec58d4addd3675fd86b045d1f1b99a3e281f6270ab5d2a70f3
|
||||||
|
@ -0,0 +1,42 @@
|
|||||||
|
# Copyright 1999-2020 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
EGO_PN="github.com/google/cadvisor"
|
||||||
|
COMMIT=49033161
|
||||||
|
inherit golang-build golang-vcs-snapshot
|
||||||
|
|
||||||
|
DESCRIPTION="Analyzes resource usage and performance characteristics of running containers"
|
||||||
|
HOMEPAGE="https://github.com/google/cadvisor"
|
||||||
|
SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="Apache-2.0 BSD BSD-2 ISC MIT"
|
||||||
|
KEYWORDS="~amd64"
|
||||||
|
SLOT="0"
|
||||||
|
|
||||||
|
COMMON_DEPEND="acct-group/cadvisor
|
||||||
|
acct-user/cadvisor"
|
||||||
|
DEPEND="${COMMON_DEPEND}"
|
||||||
|
RDEPEND="${COMMON_DEPEND}"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
sed -i -e "/go get/d" src/${EGO_PN}/build/assets.sh || die
|
||||||
|
sed -i -e "s/git describe.*/echo ${PV} )/"\
|
||||||
|
-e "s/git rev-parse --short HEAD.*/echo ${COMMIT} )/"\
|
||||||
|
src/${EGO_PN}/build/build.sh || die
|
||||||
|
default
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
export -n GOCACHE XDG_CACHE_HOME
|
||||||
|
pushd "src/${EGO_PN}"
|
||||||
|
GO_FLAGS="-v -work -x" VERBOSE="true" GOPATH="${S}:$(get_golibdir_gopath)" emake build
|
||||||
|
popd || die
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
|
||||||
|
dobin src/${EGO_PN}/${PN}
|
||||||
|
keepdir /var/log/${PN}
|
||||||
|
fowners ${PN}:${PN} /var/log/${PN}
|
||||||
|
}
|
@ -1 +1,2 @@
|
|||||||
DIST vice-3.1.tar.gz 30714226 BLAKE2B 75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e SHA512 bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579
|
DIST vice-3.1.tar.gz 30714226 BLAKE2B 75c2cce5294dad5b954cd23b623b6b4610c8142a09aef05dbefed6b3e6b268077d375e644dde6a057682d41ab9cf15e93a9f4a9359bfa0d1567d6d1862053a0e SHA512 bc02a3597a17dadb37c487e6942192c0e9dc1a7d4e440fbf0dc8a165dbb2dee60ddf157697a020d2780ddef56a0a67802768d5c6d117b9cf5cdc124de45bc579
|
||||||
|
DIST vice-emu-code-r37498-trunk-vice.zip 26810776 BLAKE2B 05baa0d123e9a0f1141ef68940455b5abfccde0204d0ffeb0a806212977be6f1f2c777267cad077272f4e09fa3c6adb9e95436adaaee5482b2ce918a3485caeb SHA512 5b4c31e51efc67ac08f6fe9361c42b80115b315fc24c128861341f2eea7567bdbb1761e52bc914df442ed5cc7f2ca7c6b0a2694441d63e63f9f693bcf72c70c0
|
||||||
|
@ -0,0 +1,175 @@
|
|||||||
|
# Copyright 1999-2020 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
|
||||||
|
inherit autotools multibuild
|
||||||
|
|
||||||
|
MY_P="vice-emu-code-r${PV##*_p}-trunk-vice"
|
||||||
|
|
||||||
|
DESCRIPTION="The Versatile Commodore Emulator"
|
||||||
|
HOMEPAGE="http://vice-emu.sourceforge.net/"
|
||||||
|
#SRC_URI="mirror://sourceforge/vice-emu/releases/${P}.tar.gz"
|
||||||
|
SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.zip"
|
||||||
|
|
||||||
|
LICENSE="GPL-2+"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame libav mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
|
||||||
|
REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
|
||||||
|
|
||||||
|
RDEPEND="
|
||||||
|
sys-libs/readline:0=
|
||||||
|
virtual/libintl
|
||||||
|
alsa? ( media-libs/alsa-lib )
|
||||||
|
ethernet? (
|
||||||
|
>=net-libs/libpcap-0.9.8
|
||||||
|
>=net-libs/libnet-1.1.2.1:1.1
|
||||||
|
)
|
||||||
|
ffmpeg? (
|
||||||
|
libav? ( media-video/libav:= )
|
||||||
|
!libav? ( media-video/ffmpeg:= )
|
||||||
|
)
|
||||||
|
flac? ( media-libs/flac )
|
||||||
|
gif? ( media-libs/giflib:= )
|
||||||
|
gtk? (
|
||||||
|
dev-libs/glib:2
|
||||||
|
media-libs/fontconfig:1.0
|
||||||
|
x11-libs/gtk+:3
|
||||||
|
opengl? (
|
||||||
|
media-libs/glew:0=
|
||||||
|
virtual/opengl
|
||||||
|
)
|
||||||
|
)
|
||||||
|
jpeg? ( virtual/jpeg )
|
||||||
|
lame? ( media-sound/lame )
|
||||||
|
mpg123? ( media-sound/mpg123 )
|
||||||
|
ogg? (
|
||||||
|
media-libs/libogg
|
||||||
|
media-libs/libvorbis
|
||||||
|
)
|
||||||
|
parport? ( sys-libs/libieee1284 )
|
||||||
|
pci? ( sys-apps/pciutils )
|
||||||
|
png? ( media-libs/libpng:0= )
|
||||||
|
portaudio? ( media-libs/portaudio )
|
||||||
|
pulseaudio? ( media-sound/pulseaudio )
|
||||||
|
sdl? ( media-libs/libsdl2[video] )
|
||||||
|
zlib? ( sys-libs/zlib )
|
||||||
|
"
|
||||||
|
|
||||||
|
DEPEND="
|
||||||
|
${RDEPEND}
|
||||||
|
x11-base/xorg-proto
|
||||||
|
"
|
||||||
|
|
||||||
|
BDEPEND="
|
||||||
|
app-arch/unzip
|
||||||
|
dev-embedded/xa
|
||||||
|
dev-lang/perl
|
||||||
|
sys-apps/texinfo
|
||||||
|
sys-devel/flex
|
||||||
|
sys-devel/gettext
|
||||||
|
virtual/pkgconfig
|
||||||
|
virtual/yacc
|
||||||
|
doc? ( virtual/texi2dvi )
|
||||||
|
"
|
||||||
|
|
||||||
|
S="${WORKDIR}/${MY_P}"
|
||||||
|
ECONF_SOURCE="${S}"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
default
|
||||||
|
|
||||||
|
# Delete some bundled libraries.
|
||||||
|
rm -r src/lib/lib{ffmpeg,lame,x264} || die
|
||||||
|
|
||||||
|
sed "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g" < configure.proto > configure.ac || die
|
||||||
|
|
||||||
|
local DIR
|
||||||
|
for DIR in src/resid src/resid-dtv .; do
|
||||||
|
pushd "${DIR}" || die
|
||||||
|
AT_NO_RECURSIVE=1 eautoreconf
|
||||||
|
popd || die
|
||||||
|
done
|
||||||
|
|
||||||
|
# Strip the predefined C(XX)FLAGS.
|
||||||
|
sed -i -r 's:(VICE_C(XX)?FLAGS=)"[^$]+":\1:' configure || die
|
||||||
|
}
|
||||||
|
|
||||||
|
src_configure() {
|
||||||
|
MULTIBUILD_VARIANTS=(
|
||||||
|
$(usev gtk)
|
||||||
|
$(usev headless)
|
||||||
|
$(usev sdl)
|
||||||
|
)
|
||||||
|
|
||||||
|
multibuild_foreach_variant run_in_build_dir multibuild_src_configure
|
||||||
|
}
|
||||||
|
|
||||||
|
multibuild_enable() {
|
||||||
|
if [[ ${MULTIBUILD_VARIANT} == $1 ]]; then
|
||||||
|
printf -- "--enable-%s\n" "$2"
|
||||||
|
else
|
||||||
|
printf -- "--disable-%s\n" "$2"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
multibuild_src_configure() {
|
||||||
|
# Some dependencies lack configure options so prevent them becoming
|
||||||
|
# automagic by using configure cache variables.
|
||||||
|
use flac || export ac_cv_header_FLAC_stream_decoder_h=no
|
||||||
|
use mpg123 || export ac_cv_header_mpg123_h=no
|
||||||
|
use ogg || export ac_cv_header_vorbis_vorbisfile_h=no
|
||||||
|
use pci || export ac_cv_header_pci_pci_h=no
|
||||||
|
|
||||||
|
# Ensure we use giflib, not ungif.
|
||||||
|
export ac_cv_lib_ungif_EGifPutLine=no
|
||||||
|
|
||||||
|
# Append ".variant" to x* programs if building multiple variants.
|
||||||
|
if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
|
||||||
|
xform="/^x/s/\$/.${MULTIBUILD_VARIANT}/"
|
||||||
|
else
|
||||||
|
unset xform
|
||||||
|
fi
|
||||||
|
|
||||||
|
econf \
|
||||||
|
--program-transform-name="${xform}" \
|
||||||
|
--disable-sdlui \
|
||||||
|
$(multibuild_enable sdl sdlui2) \
|
||||||
|
$(multibuild_enable gtk native-gtk3ui) \
|
||||||
|
$(use_enable debug debug-gtk3ui) \
|
||||||
|
$(multibuild_enable headless headlessui) \
|
||||||
|
$(use_enable opengl hwscale) \
|
||||||
|
--disable-shared-ffmpeg \
|
||||||
|
--disable-static-ffmpeg \
|
||||||
|
$(use_enable ffmpeg external-ffmpeg) \
|
||||||
|
$(use_enable ethernet) \
|
||||||
|
$(use_enable ipv6) \
|
||||||
|
$(use_enable parport libieee1284) \
|
||||||
|
$(use_enable portaudio) \
|
||||||
|
$(use_enable lame) \
|
||||||
|
$(use_enable debug) \
|
||||||
|
--disable-arch \
|
||||||
|
$(use_enable doc pdf-docs) \
|
||||||
|
--enable-html-docs \
|
||||||
|
$(use_with pulseaudio pulse) \
|
||||||
|
$(use_with alsa) \
|
||||||
|
$(use_with oss) \
|
||||||
|
$(use_with jpeg) \
|
||||||
|
$(use_with png) \
|
||||||
|
$(use_with gif) \
|
||||||
|
$(use_with zlib)
|
||||||
|
}
|
||||||
|
|
||||||
|
src_compile() {
|
||||||
|
multibuild_foreach_variant run_in_build_dir emake
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
multibuild_foreach_variant run_in_build_dir default
|
||||||
|
dodoc FEEDBACK
|
||||||
|
|
||||||
|
# Delete the bundled fonts. These could be packaged separately but
|
||||||
|
# they're only for the HTML documentation.
|
||||||
|
rm -r "${ED}"/usr/share/doc/${PF}/html/fonts/ || die
|
||||||
|
}
|
Binary file not shown.
@ -0,0 +1,22 @@
|
|||||||
|
--- a/CMakeLists.txt 2020-02-17 02:07:48.201051509 +0100
|
||||||
|
+++ b/CMakeLists.txt 2020-02-17 02:10:26.790061722 +0100
|
||||||
|
@@ -176,18 +176,7 @@
|
||||||
|
ENDIF()
|
||||||
|
|
||||||
|
#=========================Changelog custom target==============================
|
||||||
|
-FIND_PROGRAM( GZIP_CMD gzip )
|
||||||
|
-IF( GZIP_CMD )
|
||||||
|
- SET( CHANGELOG_UNCOMPRESSED "${CMAKE_CURRENT_SOURCE_DIR}/CHANGES.markdown" )
|
||||||
|
- SET( CHANGELOG "${CMAKE_CURRENT_BINARY_DIR}/changelog.gz" )
|
||||||
|
- ADD_CUSTOM_COMMAND(
|
||||||
|
- OUTPUT ${CHANGELOG}
|
||||||
|
- COMMAND ${GZIP_CMD} -9 -n -c ${CHANGELOG_UNCOMPRESSED} > ${CHANGELOG}
|
||||||
|
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
|
||||||
|
- MAIN_DEPENDENCY ${CHANGELOG_UNCOMPRESSED}
|
||||||
|
- )
|
||||||
|
- ADD_CUSTOM_TARGET(changelog ALL DEPENDS ${CHANGELOG})
|
||||||
|
-ENDIF()
|
||||||
|
+SET( CHANGELOG "${CMAKE_CURRENT_SOURCE_DIR}/CHANGES.markdown" )
|
||||||
|
|
||||||
|
#=========================Detect Debian========================================
|
||||||
|
IF( EXISTS "/etc/debian_version" )
|
@ -0,0 +1,164 @@
|
|||||||
|
From 761bb3882c4c243a49279b67e53c87e5e5d2928f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mik Firestone <mikfire@gmail.com>
|
||||||
|
Date: Sat, 19 Mar 2016 23:01:54 -0400
|
||||||
|
Subject: [PATCH 1/2] Closes #127 - TravisCI can't find webkit
|
||||||
|
|
||||||
|
Qt 5.6 did away with the web kit, but none of our build environment have the
|
||||||
|
replacement yet. This patch replaces all the WebDocs with TextBrowser, which
|
||||||
|
seems to work and should compile.
|
||||||
|
|
||||||
|
I removed the webkit requirement from the CMakeLists file, but I wasn't sure
|
||||||
|
if the webkitwidgets needed axed as well. Although writing it out makes the
|
||||||
|
answer somewhat obvious.
|
||||||
|
---
|
||||||
|
src/BrewDayScrollWidget.cpp | 2 +-
|
||||||
|
src/BrewDayScrollWidget.h | 4 ++--
|
||||||
|
src/BrewDayWidget.cpp | 4 ++--
|
||||||
|
src/BrewDayWidget.h | 4 ++--
|
||||||
|
src/CMakeLists.txt | 2 --
|
||||||
|
src/RecipeFormatter.cpp | 2 +-
|
||||||
|
src/RecipeFormatter.h | 4 ++--
|
||||||
|
7 files changed, 10 insertions(+), 12 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/BrewDayScrollWidget.cpp b/src/BrewDayScrollWidget.cpp
|
||||||
|
index 760d2dc5..0846d791 100644
|
||||||
|
--- a/src/BrewDayScrollWidget.cpp
|
||||||
|
+++ b/src/BrewDayScrollWidget.cpp
|
||||||
|
@@ -35,7 +35,7 @@
|
||||||
|
#include "mash.h"
|
||||||
|
|
||||||
|
BrewDayScrollWidget::BrewDayScrollWidget(QWidget* parent)
|
||||||
|
- : QWidget(parent), doc(new QWebView())
|
||||||
|
+ : QWidget(parent), doc(new QTextBrowser())
|
||||||
|
{
|
||||||
|
setupUi(this);
|
||||||
|
setObjectName("BrewDayScrollWidget");
|
||||||
|
--- a/src/BrewDayScrollWidget.h
|
||||||
|
+++ b/src/BrewDayScrollWidget.h
|
||||||
|
@@ -27,7 +27,7 @@ class BrewDayScrollWidget;
|
||||||
|
#include "ui_brewDayScrollWidget.h"
|
||||||
|
#include <QWidget>
|
||||||
|
#include <QSize>
|
||||||
|
-#include <QWebView>
|
||||||
|
+#include <QTextBrowser>
|
||||||
|
#include <QPrinter>
|
||||||
|
#include <QPrintDialog>
|
||||||
|
#include <QFile>
|
||||||
|
@@ -90,7 +90,7 @@ private slots:
|
||||||
|
|
||||||
|
Recipe* recObs;
|
||||||
|
QPrinter* printer;
|
||||||
|
- QWebView* doc;
|
||||||
|
+ QTextBrowser* doc;
|
||||||
|
//! Internal list of recipe instructions, always sorted by instruction number.
|
||||||
|
QList<Instruction*> recIns;
|
||||||
|
|
||||||
|
--- a/src/BrewDayWidget.cpp
|
||||||
|
+++ b/src/BrewDayWidget.cpp
|
||||||
|
@@ -37,7 +37,7 @@
|
||||||
|
|
||||||
|
// NOTE: QPrinter has no parent? Will it get destroyed properly?
|
||||||
|
BrewDayWidget::BrewDayWidget(QWidget* parent) :
|
||||||
|
- QWidget(parent), recObs(0), printer(new QPrinter()), doc(new QWebView(this))
|
||||||
|
+ QWidget(parent), recObs(0), printer(new QPrinter()), doc(new QTextBrowser(this))
|
||||||
|
{
|
||||||
|
setupUi(this);
|
||||||
|
|
||||||
|
@@ -291,7 +291,7 @@ void BrewDayWidget::pushInstructionPrint()
|
||||||
|
QString pDoc;
|
||||||
|
QPrintDialog *dialog = new QPrintDialog(printer, this);
|
||||||
|
|
||||||
|
- /* Instantiate the Webview and then connect its signal */
|
||||||
|
+ /* Instantiate the TextBrowser and then connect its signal */
|
||||||
|
connect( doc, SIGNAL(loadFinished(bool)), this, SLOT(loadComplete(bool)) );
|
||||||
|
|
||||||
|
dialog->setWindowTitle(tr("Print Document"));
|
||||||
|
--- a/src/BrewDayWidget.h
|
||||||
|
+++ b/src/BrewDayWidget.h
|
||||||
|
@@ -27,7 +27,7 @@ class BrewDayWidget;
|
||||||
|
#include "ui_brewDayWidget.h"
|
||||||
|
#include <QWidget>
|
||||||
|
#include <QSize>
|
||||||
|
-#include <QWebView>
|
||||||
|
+#include <QTextBrowser>
|
||||||
|
#include <QMetaProperty>
|
||||||
|
#include <QVariant>
|
||||||
|
|
||||||
|
@@ -70,7 +70,7 @@ public slots:
|
||||||
|
|
||||||
|
Recipe* recObs;
|
||||||
|
QPrinter* printer;
|
||||||
|
- QWebView* doc;
|
||||||
|
+ QTextBrowser* doc;
|
||||||
|
|
||||||
|
QString cssName;
|
||||||
|
|
||||||
|
--- a/src/CMakeLists.txt
|
||||||
|
+++ b/src/CMakeLists.txt
|
||||||
|
@@ -424,7 +424,5 @@ SET( QT5_USE_MODULES_LIST
|
||||||
|
Sql
|
||||||
|
Svg
|
||||||
|
Xml
|
||||||
|
- WebKit
|
||||||
|
- WebKitWidgets
|
||||||
|
)
|
||||||
|
|
||||||
|
diff --git a/src/RecipeFormatter.cpp b/src/RecipeFormatter.cpp
|
||||||
|
index bb6a9295..f8a1ab4c 100644
|
||||||
|
--- a/src/RecipeFormatter.cpp
|
||||||
|
+++ b/src/RecipeFormatter.cpp
|
||||||
|
@@ -52,7 +52,7 @@ RecipeFormatter::RecipeFormatter(QObject* parent)
|
||||||
|
docDialog->setWindowTitle("Print Preview");
|
||||||
|
if( docDialog->layout() == 0 )
|
||||||
|
docDialog->setLayout(new QVBoxLayout(docDialog));
|
||||||
|
- doc = new QWebView(docDialog);
|
||||||
|
+ doc = new QTextBrowser(docDialog);
|
||||||
|
docDialog->layout()->addWidget(doc);
|
||||||
|
/*
|
||||||
|
// Add a print button at the bottom.
|
||||||
|
--- a/src/RecipeFormatter.h
|
||||||
|
+++ b/src/RecipeFormatter.h
|
||||||
|
@@ -28,7 +28,7 @@ class RecipeFormatter;
|
||||||
|
#include <QObject>
|
||||||
|
#include <QPrinter>
|
||||||
|
#include <QPrintDialog>
|
||||||
|
-#include <QWebView>
|
||||||
|
+#include <QTextBrowser>
|
||||||
|
#include <QDialog>
|
||||||
|
#include <QFile>
|
||||||
|
#include "recipe.h"
|
||||||
|
@@ -114,7 +114,7 @@ public slots:
|
||||||
|
Recipe* rec;
|
||||||
|
|
||||||
|
QPrinter* printer;
|
||||||
|
- QWebView* doc;
|
||||||
|
+ QTextBrowser* doc;
|
||||||
|
QDialog* docDialog;
|
||||||
|
QString cssName;
|
||||||
|
|
||||||
|
|
||||||
|
From 3e0223a3b95c0e1169115cd14d0ede7f17c4f30f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Mik Firestone <mikfire@gmail.com>
|
||||||
|
Date: Sat, 19 Mar 2016 23:09:41 -0400
|
||||||
|
Subject: [PATCH 2/2] Missed a few edits.
|
||||||
|
|
||||||
|
Missed some entries in the CMakeList files.
|
||||||
|
---
|
||||||
|
CMakeLists.txt | 6 ------
|
||||||
|
1 file changed, 6 deletions(-)
|
||||||
|
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -153,12 +153,6 @@ INCLUDE_DIRECTORIES(${Qt5Sql_INCLUDE_DIRS})
|
||||||
|
FIND_PACKAGE(Qt5Svg REQUIRED)
|
||||||
|
INCLUDE_DIRECTORIES(${Qt5Svg_INCLUDE_DIRS})
|
||||||
|
|
||||||
|
-FIND_PACKAGE(Qt5WebKit REQUIRED)
|
||||||
|
-INCLUDE_DIRECTORIES(${Qt5WebKit_INCLUDE_DIRS})
|
||||||
|
-
|
||||||
|
-FIND_PACKAGE(Qt5WebKitWidgets REQUIRED)
|
||||||
|
-INCLUDE_DIRECTORIES(${Qt5WebKitWidgets_INCLUDE_DIRS})
|
||||||
|
-
|
||||||
|
FIND_PACKAGE(Qt5Xml REQUIRED)
|
||||||
|
INCLUDE_DIRECTORIES(${Qt5Xml_INCLUDE_DIRS})
|
||||||
|
|
@ -0,0 +1,39 @@
|
|||||||
|
# Copyright 1999-2020 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=7
|
||||||
|
|
||||||
|
inherit bash-completion-r1 toolchain-funcs
|
||||||
|
|
||||||
|
DESCRIPTION="The missing terminal file browser for X"
|
||||||
|
HOMEPAGE="https://github.com/jarun/nnn"
|
||||||
|
SRC_URI="https://github.com/jarun/nnn/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||||
|
|
||||||
|
LICENSE="BSD-2"
|
||||||
|
SLOT="0"
|
||||||
|
KEYWORDS="~amd64 ~x86"
|
||||||
|
|
||||||
|
DEPEND="sys-libs/ncurses:0=
|
||||||
|
sys-libs/readline:0="
|
||||||
|
RDEPEND="${DEPEND}"
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
default
|
||||||
|
tc-export CC
|
||||||
|
sed -i -e '/strip/d' Makefile || die "sed failed"
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
src_install() {
|
||||||
|
emake PREFIX="/usr" DESTDIR="${D}" install
|
||||||
|
|
||||||
|
newbashcomp misc/auto-completion/bash/nnn-completion.bash nnn
|
||||||
|
|
||||||
|
insinto /usr/share/fish/vendor_completions.d
|
||||||
|
doins misc/auto-completion/fish/nnn.fish
|
||||||
|
|
||||||
|
insinto /usr/share/zsh/site-functions
|
||||||
|
doins misc/auto-completion/zsh/_nnn
|
||||||
|
|
||||||
|
einstalldocs
|
||||||
|
}
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
|||||||
DIST glibmm-2.60.1.tar.xz 7132072 BLAKE2B 8d25287b7805d7196bffa909447db0e0fa0edd1c243b3ccdef91f1a6573ea0723cda8e88993e878e6c8440b23488b0ab8c9ed727bd4e2d4a46f56ba251510aa0 SHA512 89f1d10bd9b60232519e2e13c02b0b1010dacbe67a8bab06c3a5873649e5090ed3593d518bfd8e12933a08aaa5fc654b1475efc208e2256c7efd197274a28b79
|
DIST glibmm-2.60.1.tar.xz 7132072 BLAKE2B 8d25287b7805d7196bffa909447db0e0fa0edd1c243b3ccdef91f1a6573ea0723cda8e88993e878e6c8440b23488b0ab8c9ed727bd4e2d4a46f56ba251510aa0 SHA512 89f1d10bd9b60232519e2e13c02b0b1010dacbe67a8bab06c3a5873649e5090ed3593d518bfd8e12933a08aaa5fc654b1475efc208e2256c7efd197274a28b79
|
||||||
|
DIST glibmm-2.62.0.tar.xz 7398144 BLAKE2B a289c2e6a5737d9fa3d507e4741c1d19e949244db5a6eaec2329bda92e7e0a78e33acf9668ced19a52507fa88531da63fa35cf59dfb44ad2a7a8fa0839c7dae4 SHA512 f26fca5724c17d915480556b6918ae6e4999c14a25e7623cda3d37a59d6965310fc2b2d8a8500a849f1d0f00fd2d326eeddc690207846d38a13ae695ad0805de
|
||||||
|
@ -0,0 +1,66 @@
|
|||||||
|
# Copyright 1999-2020 Gentoo Authors
|
||||||
|
# Distributed under the terms of the GNU General Public License v2
|
||||||
|
|
||||||
|
EAPI=6
|
||||||
|
inherit gnome2 multilib-minimal
|
||||||
|
|
||||||
|
DESCRIPTION="C++ interface for glib2"
|
||||||
|
HOMEPAGE="https://www.gtkmm.org"
|
||||||
|
|
||||||
|
LICENSE="LGPL-2.1+ GPL-2+" # GPL-2+ applies only to the build system
|
||||||
|
SLOT="2"
|
||||||
|
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
|
||||||
|
IUSE="doc debug test"
|
||||||
|
RESTRICT="!test? ( test )"
|
||||||
|
|
||||||
|
RDEPEND="
|
||||||
|
>=dev-libs/libsigc++-2.9.1:2[${MULTILIB_USEDEP}]
|
||||||
|
>=dev-libs/glib-2.61.2:2[${MULTILIB_USEDEP}]
|
||||||
|
"
|
||||||
|
DEPEND="${RDEPEND}
|
||||||
|
virtual/pkgconfig
|
||||||
|
doc? ( app-doc/doxygen )
|
||||||
|
"
|
||||||
|
# dev-cpp/mm-common needed for eautoreconf
|
||||||
|
|
||||||
|
src_prepare() {
|
||||||
|
if ! use test; then
|
||||||
|
# don't waste time building tests
|
||||||
|
sed 's/^\(SUBDIRS =.*\)tests\(.*\)$/\1\2/' \
|
||||||
|
-i Makefile.am Makefile.in || die "sed 1 failed"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# don't build examples - we want to install example sources, not binaries
|
||||||
|
sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' \
|
||||||
|
-i Makefile.am Makefile.in || die "sed 2 failed"
|
||||||
|
|
||||||
|
gnome2_src_prepare
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_configure() {
|
||||||
|
ECONF_SOURCE="${S}" gnome2_src_configure \
|
||||||
|
$(use_enable debug debug-refcounting) \
|
||||||
|
$(multilib_native_use_enable doc documentation) \
|
||||||
|
--enable-deprecated-api
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_test() {
|
||||||
|
cd tests
|
||||||
|
default
|
||||||
|
|
||||||
|
for i in */test; do
|
||||||
|
${i} || die "Running tests failed at ${i}"
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_install() {
|
||||||
|
gnome2_src_install
|
||||||
|
}
|
||||||
|
|
||||||
|
multilib_src_install_all() {
|
||||||
|
einstalldocs
|
||||||
|
|
||||||
|
find examples -type d -name '.deps' -exec rm -rf {} \; 2>/dev/null
|
||||||
|
find examples -type f -name 'Makefile*' -exec rm -f {} \; 2>/dev/null
|
||||||
|
dodoc -r examples
|
||||||
|
}
|
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue