root
4 years ago
parent
008b4ae592
commit
e46d16f19f
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST okteta-0.26.2.tar.xz 976264 BLAKE2B 6bd0708ecab61097130ad3b96d44c4a58a7711f6d9ecc9c70d3db792728489f395e691b0157f0cf8ffc0e07b1796ce6fde9f689108c3236412ad37c4e87a210a SHA512 9d79cfecf80a7bfd4eb42ac8ee93d83140064601c16be0bed38481f7f0ea8ed2fa0aedfd16be3547f2bbd65ab483281e0ecdc0e59799040d67ecf1b4cda39246
|
||||
DIST okteta-0.26.3.tar.xz 947272 BLAKE2B c4502315a3713aebfb6f19adb92b01268346b0f71f1f59007b7f0dc06aa1ad71993a7b022669f7912ad10cec6c7d2eed9b552d66294f6b6657e664c3b1ba95bd SHA512 345e6ebb339a046e66e0d5b056ee487d881afa21d1ed29db2fb213200e431ba6936b1bf75a49733c14c96bdbee2482ed860257b0666b19f701c5ad0fd57e58c6
|
||||
|
||||
@ -0,0 +1,70 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
ECM_DESIGNERPLUGIN="true"
|
||||
ECM_HANDBOOK="forceoptional"
|
||||
ECM_TEST="true"
|
||||
KFMIN=5.60.0
|
||||
QTMIN=5.12.3
|
||||
VIRTUALX_REQUIRED="test"
|
||||
inherit ecm kde.org
|
||||
|
||||
DESCRIPTION="Hex editor by KDE"
|
||||
HOMEPAGE="https://kde.org/applications/utilities/org.kde.okteta
|
||||
https://utils.kde.org/projects/okteta/"
|
||||
|
||||
if [[ ${KDE_BUILD_TYPE} = release ]]; then
|
||||
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
fi
|
||||
|
||||
LICENSE="GPL-2 handbook? ( FDL-1.2 )"
|
||||
SLOT="5"
|
||||
IUSE="crypt"
|
||||
|
||||
DEPEND="
|
||||
>=dev-qt/qtdeclarative-${QTMIN}:5
|
||||
>=dev-qt/qtgui-${QTMIN}:5
|
||||
>=dev-qt/qtnetwork-${QTMIN}:5
|
||||
>=dev-qt/qtprintsupport-${QTMIN}:5
|
||||
>=dev-qt/qtscript-${QTMIN}:5[scripttools]
|
||||
>=dev-qt/qtwidgets-${QTMIN}:5
|
||||
>=dev-qt/qtxml-${QTMIN}:5
|
||||
>=kde-frameworks/kbookmarks-${KFMIN}:5
|
||||
>=kde-frameworks/kcmutils-${KFMIN}:5
|
||||
>=kde-frameworks/kcodecs-${KFMIN}:5
|
||||
>=kde-frameworks/kcompletion-${KFMIN}:5
|
||||
>=kde-frameworks/kconfig-${KFMIN}:5
|
||||
>=kde-frameworks/kconfigwidgets-${KFMIN}:5
|
||||
>=kde-frameworks/kcoreaddons-${KFMIN}:5
|
||||
>=kde-frameworks/kcrash-${KFMIN}:5
|
||||
>=kde-frameworks/kdbusaddons-${KFMIN}:5
|
||||
>=kde-frameworks/ki18n-${KFMIN}:5
|
||||
>=kde-frameworks/kiconthemes-${KFMIN}:5
|
||||
>=kde-frameworks/kio-${KFMIN}:5
|
||||
>=kde-frameworks/kjobwidgets-${KFMIN}:5
|
||||
>=kde-frameworks/knewstuff-${KFMIN}:5
|
||||
>=kde-frameworks/kparts-${KFMIN}:5
|
||||
>=kde-frameworks/kservice-${KFMIN}:5
|
||||
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
|
||||
>=kde-frameworks/kxmlgui-${KFMIN}:5
|
||||
crypt? ( app-crypt/qca:2[qt5(+)] )
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DOMIT_EXAMPLES=ON
|
||||
$(cmake_use_find_package crypt Qca-qt5)
|
||||
)
|
||||
|
||||
ecm_src_configure
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local myctestargs=( -j1 )
|
||||
|
||||
ecm_src_test
|
||||
}
|
||||
@ -1,38 +0,0 @@
|
||||
Removes forced march setting and align-functions on x86, as they would
|
||||
override user's CFLAGS.
|
||||
|
||||
--- qemacs-orig/Makefile
|
||||
+++ qemacs/Makefile
|
||||
@@ -29,32 +29,6 @@
|
||||
cmd :=
|
||||
endif
|
||||
|
||||
-ifeq ($(CC),gcc)
|
||||
- CFLAGS += -Wall -g -O2 -funsigned-char
|
||||
- # do not warn about zero-length formats.
|
||||
- CFLAGS += -Wno-format-zero-length
|
||||
- LDFLAGS := -g
|
||||
-endif
|
||||
-
|
||||
-#include local compiler configuration file
|
||||
--include $(DEPTH)/cflags.mk
|
||||
-
|
||||
-ifdef TARGET_GPROF
|
||||
- CFLAGS += -p
|
||||
- LDFLAGS += -p
|
||||
-endif
|
||||
-
|
||||
-TLDFLAGS := $(LDFLAGS)
|
||||
-
|
||||
-ifdef TARGET_ARCH_X86
|
||||
- #CFLAGS+=-fomit-frame-pointer
|
||||
- ifeq ($(GCC_MAJOR),2)
|
||||
- CFLAGS+=-m386 -malign-functions=0
|
||||
- else
|
||||
- CFLAGS+=-march=i386 -falign-functions=0
|
||||
- endif
|
||||
-endif
|
||||
-
|
||||
DEFINES=-DHAVE_QE_CONFIG_H
|
||||
|
||||
########################################################
|
||||
@ -1,38 +0,0 @@
|
||||
Suppress stripping.
|
||||
|
||||
--- qemacs-orig/Makefile
|
||||
+++ qemacs/Makefile
|
||||
@@ -168,7 +168,6 @@
|
||||
qe$(EXE): qe_g$(EXE) Makefile
|
||||
@rm -f $@
|
||||
cp $< $@
|
||||
- -$(STRIP) $@
|
||||
@ls -l $@
|
||||
@echo `size $@` `wc -c $@` qe $(OPTIONS) \
|
||||
| cut -d ' ' -f 7-10,13,15-40 >> STATS
|
||||
@@ -183,7 +182,6 @@
|
||||
tqe$(EXE): tqe_g$(EXE) Makefile
|
||||
@rm -f $@
|
||||
cp $< $@
|
||||
- -$(STRIP) $@
|
||||
@ls -l $@
|
||||
@echo `size $@` `wc -c $@` tqe $(OPTIONS) \
|
||||
| cut -d ' ' -f 7-10,13,15-40 >> STATS
|
||||
@@ -386,7 +384,7 @@
|
||||
$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin
|
||||
$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
|
||||
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/qe
|
||||
- $(INSTALL) -m 755 -s qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
|
||||
+ $(INSTALL) -m 755 qe$(EXE) $(DESTDIR)$(prefix)/bin/qemacs$(EXE)
|
||||
ln -sf qemacs $(DESTDIR)$(prefix)/bin/qe$(EXE)
|
||||
ifdef CONFIG_FFMPEG
|
||||
ln -sf qemacs$(EXE) $(DESTDIR)$(prefix)/bin/ffplay$(EXE)
|
||||
@@ -394,7 +392,7 @@
|
||||
$(INSTALL) -m 644 kmaps ligatures $(DESTDIR)$(datadir)/qe
|
||||
$(INSTALL) -m 644 qe.1 $(DESTDIR)$(mandir)/man1
|
||||
ifdef CONFIG_HTML
|
||||
- $(INSTALL) -m 755 -s html2png$(EXE) $(DESTDIR)$(prefix)/bin
|
||||
+ $(INSTALL) -m 755 html2png$(EXE) $(DESTDIR)$(prefix)/bin
|
||||
endif
|
||||
|
||||
uninstall:
|
||||
Binary file not shown.
@ -1,5 +1,3 @@
|
||||
DIST free42-nologo-2.0.20.tgz 7390214 BLAKE2B 306f3378bcbb44fa7982c5d9c29bfbea62e915ca50ca5e5216f46fbf483f110a1288d4800991a74622a042517496ff8dd94c3fa3249e8bb4181957e6b23d5ea3 SHA512 9b540fbc50df2f94b135b5e778354f330df77a54ef2ad99b257b5b91d1e3e8d1241e8a834522fc46fe33571ea2695ad8889b427dbcf653870672e89cd56d60f5
|
||||
DIST free42-nologo-2.5.10.tgz 7408769 BLAKE2B eec27805199b80ce659517479bbaefe871f8e4d2fc06c138e4741d63748acdef7e04b54324ff679a820ca451fcfa34e4202edf196e426679adabe397313f8f37 SHA512 309ee3779b792208ab887b91e43c4bf7a61862b02e3c250fd09367c154345878ad80c2c949138cb5d0c5d7031ebb0d4c6d192962866b6b68fce220ab2d651b42
|
||||
DIST free42-nologo-2.5.11.tgz 7408708 BLAKE2B a7eedafb15ff52e52774b7750bd00cba0b94176d90572cf60c1b927d47a879ea834704b424b2dfcd467c3ae08566a0269d0b5b7a1418e5c4399f7c4e86dd7198 SHA512 389bacf4af420fe4bb8174d15b049f73004f9cecdfd98b1c4aafbe2076c77ba1ce1f4a7df762f4622ccbec2ffbaffc218d0afe576a977d1c583e4a4ca20eff46
|
||||
DIST free42-nologo-2.5.12.tgz 7409287 BLAKE2B 9d2e244c1d7c7c728bfde6331badee412573239e3470e84f30776f62f9c6224ff3dc3d3cea8574349aeebd171c6682cfbc12b9bbdd2decbce6b6223aae705a1f SHA512 d93d55dfedfb33f91868f92e6ab9c1db48ff05e932c6628df5bb8237192aaeb104a2da56422cecfeab2ccc24d41fb518f6901ce2424739450d56a5ae7f90cda1
|
||||
DIST free42-nologo-2.5.14.tgz 7410951 BLAKE2B 5d8087269da86a2c8c00378a3bc51d2f85e2458283ab84dbee3f6d84a373423581b983faef184e794f3c2effd3bde568a4df627a29720d8cb3970e27ddc9c3ca SHA512 0e2ed3f13448d0ea60255d5e45831fcf14efef831f7c2fef59348bd15e1e4b0c42d1b24693de4e35d350367057bc14995767e8e099eb3ed46320c6f6ba97fe69
|
||||
DIST free42-nologo-2.5.16.tgz 7412652 BLAKE2B bdea95adca140eecbb192706a5e611c1ad5d248b47aa609ac2733eb018ea74e7661a1797acf9458aa07b6015df7376b3ef329685cff984d364c2f5e26f7d213b SHA512 5adfe5ce09e3aecae7f05d3880234eb903eb48b36ee10e88be87a8941752323f97067b97cb85699fc03591fc355024eb6cd621f64c31e6e5c6dd4d5027f1ba34
|
||||
|
||||
@ -0,0 +1,39 @@
|
||||
diff -Naur free42-nologo-2.5.16.orig/gtk/Makefile free42-nologo-2.5.16/gtk/Makefile
|
||||
--- free42-nologo-2.5.16.orig/gtk/Makefile 2020-01-25 05:16:45.000000000 +0100
|
||||
+++ free42-nologo-2.5.16/gtk/Makefile 2020-02-02 20:18:50.460458652 +0100
|
||||
@@ -15,7 +15,7 @@
|
||||
# along with this program; if not, see http://www.gnu.org/licenses/.
|
||||
###############################################################################
|
||||
|
||||
-CFLAGS = -MMD \
|
||||
+CFLAGS := -MMD \
|
||||
-Wall \
|
||||
-Wno-parentheses \
|
||||
-Wno-write-strings \
|
||||
@@ -34,12 +34,14 @@
|
||||
-DDECIMAL_GLOBAL_ROUNDING=1 \
|
||||
-DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
|
||||
-DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
|
||||
- -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
|
||||
+ -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
|
||||
+ ${CFLAGS}
|
||||
|
||||
-CXXFLAGS = $(CFLAGS) \
|
||||
+CXXFLAGS := $(CFLAGS) \
|
||||
-fno-exceptions \
|
||||
-fno-rtti \
|
||||
- -D_WCHAR_T_DEFINED
|
||||
+ -D_WCHAR_T_DEFINED \
|
||||
+ ${CXXFLAGS}
|
||||
|
||||
LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-3.0)
|
||||
|
||||
@@ -114,7 +116,7 @@
|
||||
./keymap2cc
|
||||
|
||||
gcc111libbid.a:
|
||||
- sh ./build-intel-lib.sh
|
||||
+ +sh ./build-intel-lib.sh
|
||||
ln -s IntelRDFPMathLib20U1/TESTS/readtest.c
|
||||
|
||||
symlinks:
|
||||
@ -1,62 +0,0 @@
|
||||
diff -Naur free42-nologo-2.5.3.orig/gtk/Makefile free42-nologo-2.5.3/gtk/Makefile
|
||||
--- free42-nologo-2.5.3.orig/gtk/Makefile 2019-09-01 17:44:47.000000000 +0200
|
||||
+++ free42-nologo-2.5.3/gtk/Makefile 2019-09-04 00:27:16.761482125 +0200
|
||||
@@ -15,7 +15,7 @@
|
||||
# along with this program; if not, see http://www.gnu.org/licenses/.
|
||||
###############################################################################
|
||||
|
||||
-CFLAGS = -MMD \
|
||||
+CFLAGS := -MMD \
|
||||
-Wall \
|
||||
-Wno-parentheses \
|
||||
-Wno-write-strings \
|
||||
@@ -34,15 +34,17 @@
|
||||
-DDECIMAL_GLOBAL_ROUNDING=1 \
|
||||
-DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
|
||||
-DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
|
||||
- -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
|
||||
+ -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
|
||||
+ ${CFLAGS}
|
||||
|
||||
-CXXFLAGS = $(CFLAGS) \
|
||||
+CXXFLAGS := $(CFLAGS) \
|
||||
-fno-exceptions \
|
||||
-fno-rtti \
|
||||
- -D_WCHAR_T_DEFINED
|
||||
+ -D_WCHAR_T_DEFINED \
|
||||
+ ${CXXFLAGS}
|
||||
|
||||
-LDFLAGS = -L/usr/X11R6/lib
|
||||
-LIBS = gcc111libbid.a $(shell pkg-config --libs gtk+-2.0) -lXmu -lX11
|
||||
+MYLDFLAGS = -L/usr/X11R6/lib
|
||||
+LIBS = gcc111libbid.a -ldl -lpthread -lX11 -lXmu $(shell pkg-config --libs gtk+-2.0)
|
||||
|
||||
ifeq "$(shell uname -s)" "FreeBSD"
|
||||
ifdef AUDIO_ALSA
|
||||
@@ -54,6 +56,8 @@
|
||||
CFLAGS += -DF42_BIG_ENDIAN -DBID_BIG_ENDIAN
|
||||
endif
|
||||
|
||||
+MYLDFLAGS += ${LDFLAGS}
|
||||
+
|
||||
SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
|
||||
shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
|
||||
core_commands3.cc core_commands4.cc core_commands5.cc \
|
||||
@@ -95,7 +99,7 @@
|
||||
endif
|
||||
|
||||
$(EXE): $(OBJS)
|
||||
- $(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
|
||||
+ $(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS)
|
||||
|
||||
$(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks
|
||||
|
||||
@@ -119,7 +123,7 @@
|
||||
|
||||
symlinks:
|
||||
for fn in `cd ../common; /bin/ls`; do ln -s ../common/$$fn; done
|
||||
- sh ./build-intel-lib.sh
|
||||
+ +sh ./build-intel-lib.sh
|
||||
ln -s IntelRDFPMathLib20U1/TESTS/readtest.c
|
||||
touch symlinks
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
MY_PV="${PN}-nologo-${PV}"
|
||||
|
||||
DESCRIPTION="An HP-42S Calculator Simulator"
|
||||
HOMEPAGE="https://thomasokken.com/free42/"
|
||||
SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+alsa"
|
||||
|
||||
DEPEND="dev-libs/atk
|
||||
x11-libs/cairo
|
||||
x11-libs/gdk-pixbuf
|
||||
x11-libs/gtk+:2
|
||||
x11-libs/pango
|
||||
alsa? ( media-libs/alsa-lib )"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
x11-libs/libX11
|
||||
x11-libs/libXmu"
|
||||
|
||||
DOCS=( CREDITS HISTORY README )
|
||||
S="${WORKDIR}/${MY_PV}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.5.3-fix-makefile.patch"
|
||||
"${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local myconf
|
||||
use alsa && myconf="AUDIO_ALSA=yes"
|
||||
emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
|
||||
emake -C gtk clean
|
||||
emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dobin gtk/free42bin gtk/free42dec
|
||||
}
|
||||
@ -1,53 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
MY_PV="${PN}-nologo-${PV}"
|
||||
|
||||
DESCRIPTION="An HP-42S Calculator Simulator"
|
||||
HOMEPAGE="https://thomasokken.com/free42/"
|
||||
SRC_URI="https://thomasokken.com/free42/upstream/${MY_PV}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="+alsa"
|
||||
|
||||
DEPEND="dev-libs/atk
|
||||
x11-libs/cairo
|
||||
x11-libs/gdk-pixbuf
|
||||
x11-libs/gtk+:2
|
||||
x11-libs/pango
|
||||
alsa? ( media-libs/alsa-lib )"
|
||||
|
||||
RDEPEND="${DEPEND}
|
||||
x11-libs/libX11
|
||||
x11-libs/libXmu"
|
||||
|
||||
DOCS=( CREDITS HISTORY README )
|
||||
S="${WORKDIR}/${MY_PV}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-2.5.3-fix-makefile.patch"
|
||||
"${FILESDIR}/${PN}-2.5.3-fix-build-intel-lib.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local myconf
|
||||
use alsa && myconf="AUDIO_ALSA=yes"
|
||||
emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" ${myconf} -C gtk
|
||||
emake -C gtk clean
|
||||
emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C gtk
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
dobin gtk/free42bin gtk/free42dec
|
||||
}
|
||||
@ -0,0 +1,150 @@
|
||||
diff --git a/src/Makefile.am b/src/Makefile.am
|
||||
index c9b5eeb..423a201 100644
|
||||
--- a/src/Makefile.am
|
||||
+++ b/src/Makefile.am
|
||||
@@ -533,23 +533,6 @@ EXTRA_DIST += \
|
||||
$(SYSCONF_FILES) \
|
||||
$(OPENRC_CONF_FILES)
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- $(INSTALL_DATA) $(srcdir)/$$f.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- for f in $(SYSCONF_FILES:%.sysconf=%) ; \
|
||||
- do \
|
||||
- tgt=`basename $$f`; \
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/$$tgt; \
|
||||
- done
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig || :
|
||||
-
|
||||
OPENRC_CONF_DIR = $(sysconfdir)/conf.d
|
||||
|
||||
install-openrc-conf:
|
||||
@@ -615,14 +598,14 @@ SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
|
||||
BUILT_SOURCES += $(SYSTEMD_UNIT_FILES)
|
||||
DISTCLEANFILES += $(SYSTEMD_UNIT_FILES)
|
||||
|
||||
-install-systemd: $(SYSTEMD_UNIT_FILES) install-sysconfig
|
||||
+install-systemd: $(SYSTEMD_UNIT_FILES)
|
||||
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
||||
for f in $(SYSTEMD_UNIT_FILES); \
|
||||
do \
|
||||
$(INSTALL_DATA) $$f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/ ; \
|
||||
done
|
||||
|
||||
-uninstall-systemd: uninstall-sysconfig
|
||||
+uninstall-systemd:
|
||||
rm -f $(SYSTEMD_UNIT_FILES:%=$(DESTDIR)$(SYSTEMD_UNIT_DIR)/%)
|
||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) || :
|
||||
|
||||
diff --git a/src/locking/virtlockd.service.in b/src/locking/virtlockd.service.in
|
||||
index e7f8057..2449b20 100644
|
||||
--- a/src/locking/virtlockd.service.in
|
||||
+++ b/src/locking/virtlockd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlockd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/virtlockd
|
||||
-ExecStart=@sbindir@/virtlockd $VIRTLOCKD_ARGS
|
||||
+ExecStart=@sbindir@/virtlockd
|
||||
ExecReload=/bin/kill -USR1 $MAINPID
|
||||
# Loosing the locks is a really bad thing that will
|
||||
# cause the machine to be fenced (rebooted), so make
|
||||
diff --git a/src/logging/virtlogd.service.in b/src/logging/virtlogd.service.in
|
||||
index daff48e..4373619 100644
|
||||
--- a/src/logging/virtlogd.service.in
|
||||
+++ b/src/logging/virtlogd.service.in
|
||||
@@ -7,8 +7,7 @@ Documentation=man:virtlogd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/virtlogd
|
||||
-ExecStart=@sbindir@/virtlogd $VIRTLOGD_ARGS
|
||||
+ExecStart=@sbindir@/virtlogd
|
||||
ExecReload=/bin/kill -USR1 $MAINPID
|
||||
# Loosing the logs is a really bad thing that will
|
||||
# cause the machine to be fenced (rebooted), so make
|
||||
diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
|
||||
index 9c8c54a..a042280 100644
|
||||
--- a/src/remote/libvirtd.service.in
|
||||
+++ b/src/remote/libvirtd.service.in
|
||||
@@ -25,8 +25,7 @@ Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
Type=notify
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/libvirtd
|
||||
-ExecStart=@sbindir@/libvirtd $LIBVIRTD_ARGS
|
||||
+ExecStart=@sbindir@/libvirtd
|
||||
ExecReload=/bin/kill -HUP $MAINPID
|
||||
KillMode=process
|
||||
Restart=on-failure
|
||||
diff --git a/tools/Makefile.am b/tools/Makefile.am
|
||||
index 426a6ba..a65c91a 100644
|
||||
--- a/tools/Makefile.am
|
||||
+++ b/tools/Makefile.am
|
||||
@@ -297,15 +297,6 @@ install-data-local: install-systemd install-nss \
|
||||
uninstall-local: uninstall-systemd uninstall-nss \
|
||||
uninstall-bash-completion
|
||||
|
||||
-install-sysconfig:
|
||||
- $(MKDIR_P) $(DESTDIR)$(sysconfdir)/sysconfig
|
||||
- $(INSTALL_DATA) $(srcdir)/libvirt-guests.sysconf \
|
||||
- $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
-
|
||||
-uninstall-sysconfig:
|
||||
- rm -f $(DESTDIR)$(sysconfdir)/sysconfig/libvirt-guests
|
||||
- rmdir $(DESTDIR)$(sysconfdir)/sysconfig ||:
|
||||
-
|
||||
EXTRA_DIST += libvirt-guests.sh.in
|
||||
|
||||
libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status
|
||||
@@ -325,12 +316,12 @@ EXTRA_DIST += libvirt-guests.service.in
|
||||
SYSTEMD_UNIT_DIR = $(prefix)/lib/systemd/system
|
||||
|
||||
if LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||
-install-systemd: libvirt-guests.service install-sysconfig libvirt-guests.sh
|
||||
+install-systemd: libvirt-guests.service libvirt-guests.sh
|
||||
$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
|
||||
$(INSTALL_DATA) libvirt-guests.service \
|
||||
$(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
|
||||
|
||||
-uninstall-systemd: uninstall-sysconfig
|
||||
+uninstall-systemd:
|
||||
rm -f $(DESTDIR)$(SYSTEMD_UNIT_DIR)/libvirt-guests.service
|
||||
rmdir $(DESTDIR)$(SYSTEMD_UNIT_DIR) ||:
|
||||
|
||||
diff --git a/tools/libvirt-guests.service.in b/tools/libvirt-guests.service.in
|
||||
index 10c6640..f0f417b 100644
|
||||
--- a/tools/libvirt-guests.service.in
|
||||
+++ b/tools/libvirt-guests.service.in
|
||||
@@ -10,7 +10,7 @@ Documentation=man:libvirtd(8)
|
||||
Documentation=https://libvirt.org
|
||||
|
||||
[Service]
|
||||
-EnvironmentFile=-@sysconfdir@/sysconfig/libvirt-guests
|
||||
+EnvironmentFile=-/etc/libvirt/libvirt-guests.conf
|
||||
# Hack just call traditional service until we factor
|
||||
# out the code
|
||||
ExecStart=@libexecdir@/libvirt-guests.sh start
|
||||
diff --git a/tools/libvirt-guests.sysconf b/tools/libvirt-guests.sysconf
|
||||
index 669b046..45b0b9e 100644
|
||||
--- a/tools/libvirt-guests.sysconf
|
||||
+++ b/tools/libvirt-guests.sysconf
|
||||
@@ -1,3 +1,10 @@
|
||||
+#
|
||||
+# Warning: This configuration file is only sourced by the systemd
|
||||
+# libvirt-guests.service unit. The coresponding openrc facility is in
|
||||
+# /etc/init.d/libvirtd and /etc/conf.d/libvirtd
|
||||
+#
|
||||
+
|
||||
+
|
||||
# URIs to check for running guests
|
||||
# example: URIS='default xen:///system vbox+tcp://host/system lxc:///system'
|
||||
#URIS=default
|
||||
@ -0,0 +1,379 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{6,7} )
|
||||
|
||||
inherit autotools out-of-source bash-completion-r1 eutils linux-info python-any-r1 readme.gentoo-r1 systemd
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://libvirt.org/git/libvirt.git"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
SLOT="0"
|
||||
else
|
||||
SRC_URI="https://libvirt.org/sources/${P}.tar.xz"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
|
||||
SLOT="0/${PV}"
|
||||
fi
|
||||
|
||||
DESCRIPTION="C toolkit to manipulate virtual machines"
|
||||
HOMEPAGE="http://www.libvirt.org/"
|
||||
LICENSE="LGPL-2.1"
|
||||
IUSE="
|
||||
apparmor audit +caps +dbus dtrace firewalld fuse glusterfs iscsi
|
||||
iscsi-direct +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz
|
||||
parted pcap phyp policykit +qemu rbd sasl selinux +udev +vepa
|
||||
virtualbox virt-network wireshark-plugins xen zfs
|
||||
"
|
||||
|
||||
REQUIRED_USE="
|
||||
firewalld? ( virt-network )
|
||||
libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
|
||||
lxc? ( caps libvirtd )
|
||||
openvz? ( libvirtd )
|
||||
policykit? ( dbus )
|
||||
qemu? ( libvirtd )
|
||||
vepa? ( macvtap )
|
||||
virt-network? ( libvirtd )
|
||||
virtualbox? ( libvirtd )
|
||||
xen? ( libvirtd )"
|
||||
|
||||
# gettext.sh command is used by the libvirt command wrappers, and it's
|
||||
# non-optional, so put it into RDEPEND.
|
||||
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
|
||||
# package will use 3 by default. Since we don't have slot pinning in an API,
|
||||
# we must go with the most recent
|
||||
RDEPEND="
|
||||
acct-user/qemu
|
||||
policykit? ( acct-group/libvirt )
|
||||
app-misc/scrub
|
||||
>=dev-libs/glib-2.48.0
|
||||
dev-libs/libgcrypt:0
|
||||
dev-libs/libnl:3
|
||||
>=dev-libs/libxml2-2.7.6
|
||||
>=net-analyzer/openbsd-netcat-1.105-r1
|
||||
>=net-libs/gnutls-1.0.25:0=
|
||||
net-libs/libssh2
|
||||
net-libs/libtirpc
|
||||
net-libs/rpcsvc-proto
|
||||
>=net-misc/curl-7.18.0
|
||||
sys-apps/dmidecode
|
||||
>=sys-apps/util-linux-2.17
|
||||
sys-devel/gettext
|
||||
sys-libs/ncurses:0=
|
||||
sys-libs/readline:=
|
||||
apparmor? ( sys-libs/libapparmor )
|
||||
audit? ( sys-process/audit )
|
||||
caps? ( sys-libs/libcap-ng )
|
||||
dbus? ( sys-apps/dbus )
|
||||
dtrace? ( dev-util/systemtap )
|
||||
firewalld? ( >=net-firewall/firewalld-0.6.3 )
|
||||
fuse? ( >=sys-fs/fuse-2.8.6:= )
|
||||
glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
|
||||
iscsi? ( sys-block/open-iscsi )
|
||||
iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
|
||||
libssh? ( net-libs/libssh )
|
||||
lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
|
||||
lxc? ( !sys-apps/systemd[-cgroup-hybrid(+)] )
|
||||
nfs? ( net-fs/nfs-utils )
|
||||
numa? (
|
||||
>sys-process/numactl-2.0.2
|
||||
sys-process/numad
|
||||
)
|
||||
parted? (
|
||||
>=sys-block/parted-1.8[device-mapper]
|
||||
sys-fs/lvm2[-device-mapper-only(-)]
|
||||
)
|
||||
pcap? ( >=net-libs/libpcap-1.0.0 )
|
||||
policykit? ( >=sys-auth/polkit-0.9 )
|
||||
qemu? (
|
||||
>=app-emulation/qemu-1.5.0
|
||||
dev-libs/yajl
|
||||
)
|
||||
rbd? ( sys-cluster/ceph )
|
||||
sasl? ( dev-libs/cyrus-sasl )
|
||||
selinux? ( >=sys-libs/libselinux-2.0.85 )
|
||||
virt-network? (
|
||||
net-dns/dnsmasq[script]
|
||||
net-firewall/ebtables
|
||||
>=net-firewall/iptables-1.4.10[ipv6]
|
||||
net-misc/radvd
|
||||
sys-apps/iproute2[-minimal]
|
||||
)
|
||||
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) )
|
||||
wireshark-plugins? ( net-analyzer/wireshark:= )
|
||||
xen? (
|
||||
>=app-emulation/xen-4.6.0
|
||||
app-emulation/xen-tools:=
|
||||
)
|
||||
udev? (
|
||||
virtual/udev
|
||||
>=x11-libs/libpciaccess-0.10.9
|
||||
)
|
||||
zfs? ( sys-fs/zfs )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
${PYTHON_DEPS}
|
||||
app-text/xhtml1
|
||||
dev-lang/perl
|
||||
dev-libs/libxslt
|
||||
dev-perl/XML-XPath
|
||||
virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-6.0.0-do-not-use-sysconf.patch
|
||||
"${FILESDIR}"/${PN}-1.2.16-fix_paths_in_libvirt-guests_sh.patch
|
||||
"${FILESDIR}"/${PN}-5.2.0-fix-paths-for-apparmor.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
# Check kernel configuration:
|
||||
CONFIG_CHECK=""
|
||||
use fuse && CONFIG_CHECK+="
|
||||
~FUSE_FS"
|
||||
|
||||
use lvm && CONFIG_CHECK+="
|
||||
~BLK_DEV_DM
|
||||
~DM_MULTIPATH
|
||||
~DM_SNAPSHOT"
|
||||
|
||||
use lxc && CONFIG_CHECK+="
|
||||
~BLK_CGROUP
|
||||
~CGROUP_CPUACCT
|
||||
~CGROUP_DEVICE
|
||||
~CGROUP_FREEZER
|
||||
~CGROUP_NET_PRIO
|
||||
~CGROUP_PERF
|
||||
~CGROUPS
|
||||
~CGROUP_SCHED
|
||||
~CPUSETS
|
||||
~IPC_NS
|
||||
~MACVLAN
|
||||
~NAMESPACES
|
||||
~NET_CLS_CGROUP
|
||||
~NET_NS
|
||||
~PID_NS
|
||||
~POSIX_MQUEUE
|
||||
~SECURITYFS
|
||||
~USER_NS
|
||||
~UTS_NS
|
||||
~VETH
|
||||
~!GRKERNSEC_CHROOT_MOUNT
|
||||
~!GRKERNSEC_CHROOT_DOUBLE
|
||||
~!GRKERNSEC_CHROOT_PIVOT
|
||||
~!GRKERNSEC_CHROOT_CHMOD
|
||||
~!GRKERNSEC_CHROOT_CAPS"
|
||||
|
||||
kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
|
||||
~DEVPTS_MULTIPLE_INSTANCES"
|
||||
|
||||
use macvtap && CONFIG_CHECK+="
|
||||
~MACVTAP"
|
||||
|
||||
use virt-network && CONFIG_CHECK+="
|
||||
~BRIDGE_EBT_MARK_T
|
||||
~BRIDGE_NF_EBTABLES
|
||||
~NETFILTER_ADVANCED
|
||||
~NETFILTER_XT_CONNMARK
|
||||
~NETFILTER_XT_MARK
|
||||
~NETFILTER_XT_TARGET_CHECKSUM
|
||||
~IP_NF_FILTER
|
||||
~IP_NF_MANGLE
|
||||
~IP_NF_NAT
|
||||
~IP_NF_TARGET_MASQUERADE
|
||||
~IP6_NF_FILTER
|
||||
~IP6_NF_MANGLE
|
||||
~IP6_NF_NAT"
|
||||
# Bandwidth Limiting Support
|
||||
use virt-network && CONFIG_CHECK+="
|
||||
~BRIDGE_EBT_T_NAT
|
||||
~IP_NF_TARGET_REJECT
|
||||
~NET_ACT_POLICE
|
||||
~NET_CLS_FW
|
||||
~NET_CLS_U32
|
||||
~NET_SCH_HTB
|
||||
~NET_SCH_INGRESS
|
||||
~NET_SCH_SFQ"
|
||||
|
||||
# Handle specific kernel versions for different features
|
||||
kernel_is lt 3 6 && CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR"
|
||||
if kernel_is ge 3 6; then
|
||||
CONFIG_CHECK+=" ~MEMCG ~MEMCG_SWAP "
|
||||
kernel_is lt 4 5 && CONFIG_CHECK+=" ~MEMCG_KMEM "
|
||||
fi
|
||||
|
||||
ERROR_USER_NS="Optional depending on LXC configuration."
|
||||
|
||||
if [[ -n ${CONFIG_CHECK} ]]; then
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
touch "${S}/.mailmap"
|
||||
|
||||
default
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
# Reinitialize submodules as this is required for gnulib's bootstrap
|
||||
git submodule init
|
||||
# git checkouts require bootstrapping to create the configure script.
|
||||
# Additionally the submodules must be cloned to the right locations
|
||||
# bug #377279
|
||||
./bootstrap || die "bootstrap failed"
|
||||
(
|
||||
git submodule status .gnulib | awk '{ print $1 }'
|
||||
git hash-object bootstrap.conf
|
||||
git ls-tree -d HEAD gnulib/local | awk '{ print $3 }'
|
||||
) >.git-module-status
|
||||
fi
|
||||
|
||||
# Tweak the init script:
|
||||
cp "${FILESDIR}/libvirtd.init-r18" "${S}/libvirtd.init" || die
|
||||
sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
|
||||
-i "${S}/libvirtd.init" || die "sed failed"
|
||||
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
my_src_configure() {
|
||||
local myeconfargs=(
|
||||
$(use_with apparmor)
|
||||
$(use_with apparmor apparmor-profiles)
|
||||
$(use_with audit)
|
||||
$(use_with caps capng)
|
||||
$(use_with dbus)
|
||||
$(use_with dtrace)
|
||||
$(use_with firewalld)
|
||||
$(use_with fuse)
|
||||
$(use_with glusterfs)
|
||||
$(use_with glusterfs storage-gluster)
|
||||
$(use_with iscsi storage-iscsi)
|
||||
$(use_with iscsi-direct storage-iscsi-direct)
|
||||
$(use_with libvirtd)
|
||||
$(use_with libssh)
|
||||
$(use_with lvm storage-lvm)
|
||||
$(use_with lvm storage-mpath)
|
||||
$(use_with lxc)
|
||||
$(use_with macvtap)
|
||||
$(use_enable nls)
|
||||
$(use_with numa numactl)
|
||||
$(use_with numa numad)
|
||||
$(use_with openvz)
|
||||
$(use_with parted storage-disk)
|
||||
$(use_with pcap libpcap)
|
||||
$(use_with phyp)
|
||||
$(use_with policykit polkit)
|
||||
$(use_with qemu)
|
||||
$(use_with qemu yajl)
|
||||
$(use_with rbd storage-rbd)
|
||||
$(use_with sasl)
|
||||
$(use_with selinux)
|
||||
$(use_with udev)
|
||||
$(use_with vepa virtualport)
|
||||
$(use_with virt-network network)
|
||||
$(use_with wireshark-plugins wireshark-dissector)
|
||||
$(use_with xen libxl)
|
||||
$(use_with zfs storage-zfs)
|
||||
|
||||
--without-hal
|
||||
--without-netcf
|
||||
--without-sanlock
|
||||
|
||||
--with-esx
|
||||
--with-init-script=systemd
|
||||
--with-qemu-group=$(usex caps qemu root)
|
||||
--with-qemu-user=$(usex caps qemu root)
|
||||
--with-remote
|
||||
--with-storage-fs
|
||||
--with-vmware
|
||||
|
||||
--disable-static
|
||||
--disable-werror
|
||||
|
||||
--localstatedir=/var
|
||||
--enable-dependency-tracking
|
||||
)
|
||||
|
||||
if use virtualbox && has_version app-emulation/virtualbox-ose; then
|
||||
myeconfargs+=( --with-vbox=/usr/lib/virtualbox-ose/ )
|
||||
else
|
||||
myeconfargs+=( $(use_with virtualbox vbox) )
|
||||
fi
|
||||
|
||||
econf "${myeconfargs[@]}"
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
# Restore gnulib's config.sub and config.guess
|
||||
# bug #377279
|
||||
(cd ${S}/.gnulib && git reset --hard > /dev/null)
|
||||
fi
|
||||
}
|
||||
|
||||
my_src_test() {
|
||||
# remove problematic tests, bug #591416, bug #591418
|
||||
sed -i -e 's#commandtest$(EXEEXT) # #' \
|
||||
-e 's#virfirewalltest$(EXEEXT) # #' \
|
||||
-e 's#nwfilterebiptablestest$(EXEEXT) # #' \
|
||||
-e 's#nwfilterxml2firewalltest$(EXEEXT)$##' \
|
||||
tests/Makefile
|
||||
|
||||
export VIR_TEST_DEBUG=1
|
||||
HOME="${T}" emake check
|
||||
}
|
||||
|
||||
my_src_install() {
|
||||
emake DESTDIR="${D}" \
|
||||
SYSTEMD_UNIT_DIR="$(systemd_get_systemunitdir)" install
|
||||
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
|
||||
# Remove bogus, empty directories. They are either not used, or
|
||||
# libvirtd is able to create them on demand
|
||||
rm -rf "${D}"/etc/sysconfig
|
||||
rm -rf "${D}"/var
|
||||
|
||||
newbashcomp "${S}/tools/bash-completion/vsh" virsh
|
||||
bashcomp_alias virsh virt-admin
|
||||
|
||||
use libvirtd || return 0
|
||||
# From here, only libvirtd-related instructions, be warned!
|
||||
|
||||
systemd_install_serviced \
|
||||
"${FILESDIR}"/libvirtd.service.conf libvirtd.service
|
||||
|
||||
systemd_newtmpfilesd "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
|
||||
|
||||
newinitd "${S}/libvirtd.init" libvirtd
|
||||
newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
|
||||
newinitd "${FILESDIR}/virtlockd.init-r1" virtlockd
|
||||
newinitd "${FILESDIR}/virtlogd.init-r1" virtlogd
|
||||
|
||||
newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
|
||||
newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
|
||||
|
||||
DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r2")
|
||||
DISABLE_AUTOFORMATTING=true
|
||||
readme.gentoo_create_doc
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# we only ever want to generate this once
|
||||
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
|
||||
rm -rf "${D}"/etc/libvirt/qemu/networks/default.xml
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
|
||||
touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml
|
||||
fi
|
||||
|
||||
use libvirtd || return 0
|
||||
# From here, only libvirtd-related instructions, be warned!
|
||||
|
||||
readme.gentoo_print_elog
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,22 @@
|
||||
--- a/linux/bfd.c
|
||||
+++ b/linux/bfd.c
|
||||
@@ -122,8 +122,8 @@ void arch_bfdDemangle(funcs_t* funcs, size_t funcCnt) {
|
||||
|
||||
static struct bfd_section* arch_getSectionForPc(bfd* bfdh, uint64_t pc) {
|
||||
for (struct bfd_section* section = bfdh->sections; section; section = section->next) {
|
||||
- uintptr_t vma = (uintptr_t)bfd_get_section_vma(bfdh, section);
|
||||
- uintptr_t sz = (uintptr_t)bfd_get_section_size(section);
|
||||
+ uintptr_t vma = (uintptr_t)bfd_section_vma(section);
|
||||
+ uintptr_t sz = (uintptr_t)bfd_section_size(section);
|
||||
if ((pc > vma) && (pc < (vma + sz))) {
|
||||
return section;
|
||||
}
|
||||
@@ -160,7 +160,7 @@ void arch_bfdResolveSyms(pid_t pid, funcs_t* funcs, size_t num) {
|
||||
continue;
|
||||
}
|
||||
|
||||
- long sec_offset = (long)funcs[i].pc - bfd_get_section_vma(bfdParams.bfdh, section);
|
||||
+ long sec_offset = (long)funcs[i].pc - bfd_section_vma(section);
|
||||
|
||||
if (bfd_find_nearest_line(
|
||||
bfdParams.bfdh, section, bfdParams.syms, sec_offset, &file, &func, &line) == TRUE) {
|
||||
Binary file not shown.
@ -0,0 +1,53 @@
|
||||
From fda5302878692da933dc03cd011f8ddffefa07a4 Mon Sep 17 00:00:00 2001
|
||||
From: Conrad Kostecki <conrad@kostecki.com>
|
||||
Date: Sun, 2 Feb 2020 18:48:07 +0100
|
||||
Subject: [PATCH] Fix compilation with GCC >= 10.x
|
||||
|
||||
Starting with GCC >= 10.x, -fno-common is used as default
|
||||
instead of -fcommon. This patch fixes the compilation.
|
||||
|
||||
Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
|
||||
---
|
||||
clients/lcdproc/iface.c | 1 +
|
||||
clients/lcdproc/iface.h | 2 --
|
||||
clients/lcdproc/main.c | 2 ++
|
||||
3 files changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c
|
||||
index 40e50cb7..45be5b97 100644
|
||||
--- a/clients/lcdproc/iface.c
|
||||
+++ b/clients/lcdproc/iface.c
|
||||
@@ -32,6 +32,7 @@
|
||||
#define UNSET_INT -1
|
||||
#define UNSET_STR "\01"
|
||||
|
||||
+IfaceInfo iface[MAX_INTERFACES]; /* interface info */
|
||||
|
||||
static int iface_count = 0; /* number of interfaces */
|
||||
static char unit_label[10] = "B"; /* default unit label is Bytes */
|
||||
diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h
|
||||
index cc6dbaaf..ee188f38 100644
|
||||
--- a/clients/lcdproc/iface.h
|
||||
+++ b/clients/lcdproc/iface.h
|
||||
@@ -18,8 +18,6 @@
|
||||
/** max number of interfaces in multi-interface mode */
|
||||
#define MAX_INTERFACES 3
|
||||
|
||||
-IfaceInfo iface[MAX_INTERFACES]; /* interface info */
|
||||
-
|
||||
/** Update screen content */
|
||||
int iface_screen(int rep, int display, int *flags_ptr);
|
||||
/** read interface stats from /proc/net/dev */
|
||||
diff --git a/clients/lcdproc/main.c b/clients/lcdproc/main.c
|
||||
index 01b02baf..7c7a4215 100644
|
||||
--- a/clients/lcdproc/main.c
|
||||
+++ b/clients/lcdproc/main.c
|
||||
@@ -53,6 +53,8 @@
|
||||
# include "eyebox.h"
|
||||
#endif
|
||||
|
||||
+extern IfaceInfo iface[MAX_INTERFACES]; /* interface info */
|
||||
+
|
||||
/* The following 8 variables are defined 'external' in main.h! */
|
||||
int Quit = 0;
|
||||
int sock = -1;
|
||||
Binary file not shown.
Binary file not shown.
@ -1,6 +1,2 @@
|
||||
DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
|
||||
DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e815bdf278c0c5e27ab48a78301e0731cfc2a55d065cfc702b5939623e352817a3fa6102636bca6779a8903ce537 SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27
|
||||
DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
|
||||
DIST enchant-2.1.2.tar.gz 963236 BLAKE2B 3adaf9d96c7e2d7c5e31fe31ac426230f2e88b1cd6f68157e11f13c30fc5c161723d5a5b40bbe158307ce7352e098cd22272f4a75786854f7d82a0c5694b0f2b SHA512 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
|
||||
DIST enchant-2.2.3.tar.gz 957451 BLAKE2B 294c4eb7afbe97a2c8076b1b26640cb15d13dde64de7879557992e3c8ec96d68ff4fbc2c911d3c6d8811d4d5ca5a104040941ab59f8a18e324134e7ac38a2dfa SHA512 abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6
|
||||
DIST enchant-2.2.4.tar.gz 953026 BLAKE2B c1745c365c4084d92988105e072b4776e7f565a53748fdda67ab792777ce78276de5f843ae095d7c025f4f08cfa5daa5e3f9c26acf4e98b0978d589c9e9e076b SHA512 3860f04e276e1afa8969041b3f57411136d6b96ecf90996cdb122739e87be432f12219d2635c29d2e7ef3f2eeb366013026b6f8327a9749ffbc3a1dfafb4b870
|
||||
DIST enchant-2.2.7.tar.gz 951995 BLAKE2B 32232a0a8e5003dcc056b6916f95274f357ac2ab69a08fde806da12487f63eba273a57049250fc75699fb545e98e25b95dcaf00c67af2ceabe779b8798f24a5a SHA512 696455cf782b3186d19988ed59ca3cc6030a431d44ef3828039590afb08fd282a79ce6246a342e6bf7a0bf3bf63d4822d841ba01394da9f9e4394a491b2373b6
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="Spellchecker wrapping library"
|
||||
HOMEPAGE="https://abiword.github.io/enchant/"
|
||||
SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
|
||||
|
||||
IUSE="aspell +hunspell static-libs test"
|
||||
REQUIRED_USE="|| ( hunspell aspell )"
|
||||
|
||||
# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
|
||||
COMMON_DEPENDS="
|
||||
>=dev-libs/glib-2.6:2
|
||||
aspell? ( app-text/aspell )
|
||||
hunspell? ( >=app-text/hunspell-1.2.1:0= )"
|
||||
|
||||
RDEPEND="${COMMON_DEPENDS}"
|
||||
|
||||
DEPEND="${COMMON_DEPENDS}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# test? ( dev-libs/unittest++ )
|
||||
|
||||
PATCHES=(
|
||||
# Fix build with hunspell 1.5
|
||||
# https://bugs.gentoo.org/show_bug.cgi?id=600952
|
||||
"${FILESDIR}"/${PN}-2.1.0-hunspell150_fix.patch
|
||||
)
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_with aspell) \
|
||||
$(use_with hunspell) \
|
||||
$(use_enable static-libs static) \
|
||||
--without-hspell \
|
||||
--without-voikko \
|
||||
--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
@ -1,45 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="Spellchecker wrapping library"
|
||||
HOMEPAGE="https://abiword.github.io/enchant/"
|
||||
SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0/2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
|
||||
|
||||
IUSE="aspell +hunspell static-libs test"
|
||||
REQUIRED_USE="|| ( hunspell aspell )"
|
||||
|
||||
# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
|
||||
COMMON_DEPENDS="
|
||||
>=dev-libs/glib-2.6:2
|
||||
aspell? ( app-text/aspell )
|
||||
hunspell? ( >=app-text/hunspell-1.2.1:0= )"
|
||||
|
||||
RDEPEND="${COMMON_DEPENDS}"
|
||||
|
||||
DEPEND="${COMMON_DEPENDS}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# test? ( dev-libs/unittest++ )
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_with aspell) \
|
||||
$(use_with hunspell) \
|
||||
$(use_enable static-libs static) \
|
||||
--without-hspell \
|
||||
--without-voikko \
|
||||
--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
@ -1,45 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="Spellchecker wrapping library"
|
||||
HOMEPAGE="https://abiword.github.io/enchant/"
|
||||
SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0/2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
|
||||
|
||||
IUSE="aspell +hunspell static-libs test"
|
||||
REQUIRED_USE="|| ( hunspell aspell )"
|
||||
|
||||
# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
|
||||
COMMON_DEPENDS="
|
||||
>=dev-libs/glib-2.6:2
|
||||
aspell? ( app-text/aspell )
|
||||
hunspell? ( >=app-text/hunspell-1.2.1:0= )"
|
||||
|
||||
RDEPEND="${COMMON_DEPENDS}"
|
||||
|
||||
DEPEND="${COMMON_DEPENDS}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# test? ( dev-libs/unittest++ )
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_with aspell) \
|
||||
$(use_with hunspell) \
|
||||
$(use_enable static-libs static) \
|
||||
--without-hspell \
|
||||
--without-voikko \
|
||||
--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
@ -1,45 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
DESCRIPTION="Spellchecker wrapping library"
|
||||
HOMEPAGE="https://abiword.github.io/enchant/"
|
||||
SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0/2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
|
||||
|
||||
IUSE="aspell +hunspell static-libs test"
|
||||
REQUIRED_USE="|| ( hunspell aspell )"
|
||||
|
||||
# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
|
||||
COMMON_DEPENDS="
|
||||
>=dev-libs/glib-2.6:2
|
||||
aspell? ( app-text/aspell )
|
||||
hunspell? ( >=app-text/hunspell-1.2.1:0= )"
|
||||
|
||||
RDEPEND="${COMMON_DEPENDS}"
|
||||
|
||||
DEPEND="${COMMON_DEPENDS}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# test? ( dev-libs/unittest++ )
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_with aspell) \
|
||||
$(use_with hunspell) \
|
||||
$(use_enable static-libs static) \
|
||||
--without-hspell \
|
||||
--without-voikko \
|
||||
--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
@ -1,39 +1,36 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
EAPI=7
|
||||
|
||||
DESCRIPTION="Spellchecker wrapping library"
|
||||
HOMEPAGE="https://abiword.github.io/enchant/"
|
||||
SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0/2"
|
||||
LICENSE="LGPL-2.1+"
|
||||
SLOT="2"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
|
||||
|
||||
IUSE="aspell +hunspell static-libs test"
|
||||
IUSE="aspell +hunspell"
|
||||
REQUIRED_USE="|| ( hunspell aspell )"
|
||||
|
||||
# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
|
||||
COMMON_DEPENDS="
|
||||
RDEPEND="
|
||||
>=dev-libs/glib-2.6:2
|
||||
aspell? ( app-text/aspell )
|
||||
hunspell? ( >=app-text/hunspell-1.2.1:0= )"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
RDEPEND="${COMMON_DEPENDS}"
|
||||
|
||||
DEPEND="${COMMON_DEPENDS}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
# test? ( dev-libs/unittest++ )
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
--datadir="${EPREFIX}"/usr/share/enchant-2 \
|
||||
--disable-static \
|
||||
$(use_with aspell) \
|
||||
$(use_with hunspell) \
|
||||
$(use_enable static-libs static) \
|
||||
--without-hspell \
|
||||
--without-voikko \
|
||||
--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
|
||||
@ -1,25 +0,0 @@
|
||||
From 87b36fd87d8ecc894850d82eed33f48d6c429cad Mon Sep 17 00:00:00 2001
|
||||
From: Pacho Ramos <pacho@gentoo.org>
|
||||
Date: Sun, 3 Sep 2017 11:05:42 +0200
|
||||
Subject: [PATCH] Fix hunspell 1.5 support
|
||||
|
||||
---
|
||||
providers/enchant_hunspell.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/providers/enchant_hunspell.cpp b/providers/enchant_hunspell.cpp
|
||||
index 609f856..0bc360f 100644
|
||||
--- a/providers/enchant_hunspell.cpp
|
||||
+++ b/providers/enchant_hunspell.cpp
|
||||
@@ -312,7 +312,7 @@ HunspellChecker::requestDictionary(const char *szLang)
|
||||
if(hunspell == NULL){
|
||||
return false;
|
||||
}
|
||||
- char *enc = hunspell->get_dic_encoding();
|
||||
+ const char *enc = hunspell->get_dic_encoding();
|
||||
|
||||
m_translate_in = g_iconv_open(enc, "UTF-8");
|
||||
m_translate_out = g_iconv_open("UTF-8", enc);
|
||||
--
|
||||
2.14.1
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -0,0 +1,47 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python{3_6,3_7} )
|
||||
|
||||
MY_P="${P/_rc/-rc}"
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
inherit git-r3
|
||||
EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
RDEPEND="app-emulation/libvirt:=[-python(-)]"
|
||||
else
|
||||
SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
|
||||
RDEPEND="app-emulation/libvirt:0/${PV}"
|
||||
fi
|
||||
S="${WORKDIR}/${P%_rc*}"
|
||||
|
||||
DESCRIPTION="libvirt Python bindings"
|
||||
HOMEPAGE="https://www.libvirt.org"
|
||||
LICENSE="LGPL-2"
|
||||
SLOT="0"
|
||||
IUSE="examples test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
test? ( dev-python/lxml[${PYTHON_USEDEP}]
|
||||
dev-python/nose[${PYTHON_USEDEP}] )"
|
||||
|
||||
python_test() {
|
||||
esetup.py test
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
if use examples; then
|
||||
dodoc -r examples
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
fi
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST pygobject-2.28.6.tar.xz 747248 BLAKE2B 5f92794034b2d0559a623db4a7d273a7dc3f099cae87ede91b17e81acac085a9298c6b81b45b4b8540b6a75ced97e474a993437dbfcfc2133d3321d6a979b541 SHA512 37544ea2377258758169b25a2969d5ee1c9ffb9b6e63e05bc7a0471a49ac9169c51ec587d4489172c7d256f53df878a81c1992a08059aa7e43dbbb69f799545c
|
||||
DIST pygobject-3.32.1.tar.xz 551708 BLAKE2B ba7c34e4747d6a11424a23195f71877ecbd69b463b3c8aae7634a320cc8ec723e24301c0674b9ffbfdcb6d798fddddb5b772a723afc7ac28c23461e84cf7485a SHA512 5b325d0caf4f34f783fc2c664a795809f048eb1639d2f2e375fc147c852d6e29a8ab119438cac76786fb20220c72d5859cc06d6f70c29f976f6a5914e0169915
|
||||
DIST pygobject-3.34.0.tar.xz 552268 BLAKE2B a9cbeb644e0aa1b23067b591fe5c6299741395656631d39782a8c183a5d3a8e5e7f1a81acdefee186b7cc2bc34dda9271468b1828d5b9613ddc1256e24f1ecb8 SHA512 782195d22e564b88dea8d43469f0111f398b44b51a63df2fe7d07650af94d5cd037f322a5d7e405338823be3419fcdbf0113fe50b220ab1cfd07d4d01dbc4766
|
||||
|
||||
@ -0,0 +1,75 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
|
||||
|
||||
inherit gnome.org meson python-r1 virtualx xdg
|
||||
|
||||
DESCRIPTION="Python bindings for GObject Introspection"
|
||||
HOMEPAGE="https://gitlab.gnome.org/GNOME/pygobject https://wiki.gnome.org/Projects/PyGObject https://pygobject.readthedocs.io/"
|
||||
|
||||
LICENSE="LGPL-2.1+"
|
||||
SLOT="3"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="+cairo examples test"
|
||||
|
||||
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
|
||||
|
||||
RDEPEND="${PYTHON_DEPS}
|
||||
>=dev-libs/glib-2.48:2
|
||||
>=dev-libs/gobject-introspection-1.54:=
|
||||
virtual/libffi:=
|
||||
cairo? (
|
||||
>=dev-python/pycairo-1.11.1[${PYTHON_USEDEP}]
|
||||
x11-libs/cairo[glib] )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
dev-libs/atk[introspection]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
x11-libs/gdk-pixbuf:2[introspection,jpeg]
|
||||
x11-libs/gtk+:3[introspection]
|
||||
x11-libs/pango[introspection] )
|
||||
"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
src_configure() {
|
||||
configuring() {
|
||||
meson_src_configure \
|
||||
$(meson_use cairo pycairo) \
|
||||
$(meson_use test tests) \
|
||||
-Dpython="${EPYTHON}"
|
||||
}
|
||||
|
||||
python_foreach_impl configuring
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
python_foreach_impl meson_src_compile
|
||||
}
|
||||
|
||||
src_test() {
|
||||
local -x GIO_USE_VFS="local" # prevents odd issues with deleting ${T}/.gvfs
|
||||
local -x GIO_USE_VOLUME_MONITOR="unix" # prevent udisks-related failures in chroots, bug #449484
|
||||
|
||||
testing() {
|
||||
local -x XDG_CACHE_HOME="${T}/${EPYTHON}"
|
||||
meson_src_test || die "test failed for ${EPYTHON}"
|
||||
}
|
||||
virtx python_foreach_impl testing
|
||||
}
|
||||
|
||||
src_install() {
|
||||
installing() {
|
||||
meson_src_install
|
||||
python_optimize
|
||||
}
|
||||
python_foreach_impl installing
|
||||
use examples && dodoc -r examples
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST Pyro4-4.77.tar.gz 479025 BLAKE2B 20c7b53cea55b77efea11cd7b74a1cfcc45ad721ba45e039947f1d869291bfcb054f16bc48fb5ad21386fe7d47785514ff94953b1bcf893266c2c41015bba589 SHA512 52a9f90cec8c5e23ec30ddb69484a15bb86d61024d1bc718d075e01678a3d9655a1ed21f18da1891c121bf0e95282fb1151762b2fdb826a6408056079d2b1a66
|
||||
DIST Pyro4-4.78.tar.gz 490988 BLAKE2B 0fbd7129557d2b1603176a34106f9e287faa6e1725eeede7a7427c0b975f2c4e136dc4ce1573e826c43211a903fee0d7baca85fb8ae58360da7869a3309a1a2d SHA512 7a95828f6c8d9d94b8a5263c63263335c3bfaa54c5e527bd8e61d2bc00d4cdb3c4c6a92155af189401b892a6729ad91dad207e389ff43ee342a011b95ddc90e5
|
||||
|
||||
@ -0,0 +1,65 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
DISTUTILS_USE_SETUPTOOLS=rdepend
|
||||
PYTHON_COMPAT=( python3_{6,7,8} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
MY_PN="Pyro4"
|
||||
MY_P="${MY_PN}-${PV}"
|
||||
|
||||
DESCRIPTION="Distributed object middleware for Python (RPC)"
|
||||
HOMEPAGE="https://pypi.org/project/Pyro4/
|
||||
https://github.com/irmen/Pyro4"
|
||||
SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="4"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
|
||||
IUSE="doc examples test"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
!dev-python/pyro:0
|
||||
$(python_gen_cond_dep \
|
||||
'dev-python/selectors34[${PYTHON_USEDEP}]' -2)
|
||||
>=dev-python/serpent-1.27[${PYTHON_USEDEP}]"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
>=dev-python/cloudpickle-1.2.1[${PYTHON_USEDEP}]
|
||||
dev-python/dill[${PYTHON_USEDEP}]
|
||||
>=dev-python/msgpack-0.4.6[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
python_prepare_all() {
|
||||
# Disable tests requiring network connection.
|
||||
rm tests/PyroTests/test_naming.py || die
|
||||
sed \
|
||||
-e "s/testStartNSfunc/_&/" \
|
||||
-i tests/PyroTests/test_naming2.py || die
|
||||
|
||||
sed \
|
||||
-e "s/testBroadcast/_&/" \
|
||||
-e "s/testGetIP/_&/" \
|
||||
-i tests/PyroTests/test_socket.py || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_test() {
|
||||
esetup.py test
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && HTML_DOCS=( docs/. )
|
||||
if use examples; then
|
||||
dodoc -r examples
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
fi
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,28 @@
|
||||
From bf131e8d2181b3404f5293546ed390999f760404 Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Goffart <ogoffart@woboq.com>
|
||||
Date: Fri, 8 Nov 2019 11:30:40 +0100
|
||||
Subject: Do not load plugin from the $PWD
|
||||
|
||||
I see no reason why this would make sense to look for plugins in the current
|
||||
directory. And when there are plugins there, it may actually be wrong
|
||||
|
||||
Change-Id: I5f5aa168021fedddafce90effde0d5762cd0c4c5
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
---
|
||||
src/corelib/plugin/qpluginloader.cpp | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp
|
||||
index cadff4f32b..c2443dbdda 100644
|
||||
--- a/src/corelib/plugin/qpluginloader.cpp
|
||||
+++ b/src/corelib/plugin/qpluginloader.cpp
|
||||
@@ -305,7 +305,6 @@ static QString locatePlugin(const QString& fileName)
|
||||
paths.append(fileName.left(slash)); // don't include the '/'
|
||||
} else {
|
||||
paths = QCoreApplication::libraryPaths();
|
||||
- paths.prepend(QStringLiteral(".")); // search in current dir first
|
||||
}
|
||||
|
||||
for (const QString &path : qAsConst(paths)) {
|
||||
--
|
||||
cgit v1.2.1
|
||||
@ -0,0 +1,54 @@
|
||||
From e6f1fde24f77f63fb16b2df239f82a89d2bf05dd Mon Sep 17 00:00:00 2001
|
||||
From: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Date: Fri, 10 Jan 2020 09:26:27 -0800
|
||||
Subject: QLibrary/Unix: do not attempt to load a library relative to $PWD
|
||||
|
||||
I added the code in commit 5219c37f7c98f37f078fee00fe8ca35d83ff4f5d to
|
||||
find libraries in a haswell/ subdir of the main path, but we only need
|
||||
to do that transformation if the library is contains at least one
|
||||
directory seprator. That is, if the user asks to load "lib/foo", then we
|
||||
should try "lib/haswell/foo" (often, the path prefix will be absolute).
|
||||
|
||||
When the library name the user requested has no directory separators, we
|
||||
let dlopen() do the transformation for us. Testing on Linux confirms
|
||||
glibc does so:
|
||||
|
||||
$ LD_DEBUG=libs /lib64/ld-linux-x86-64.so.2 --inhibit-cache ./qml -help |& grep Xcursor
|
||||
1972475: find library=libXcursor.so.1 [0]; searching
|
||||
1972475: trying file=/usr/lib64/haswell/avx512_1/libXcursor.so.1
|
||||
1972475: trying file=/usr/lib64/haswell/libXcursor.so.1
|
||||
1972475: trying file=/usr/lib64/libXcursor.so.1
|
||||
1972475: calling init: /usr/lib64/libXcursor.so.1
|
||||
1972475: calling fini: /usr/lib64/libXcursor.so.1 [0]
|
||||
|
||||
Fixes: QTBUG-81272
|
||||
Change-Id: I596aec77785a4e4e84d5fffd15e89689bb91ffbb
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
---
|
||||
src/corelib/plugin/qlibrary_unix.cpp | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
|
||||
index f0de1010d7..135b82cd37 100644
|
||||
--- a/src/corelib/plugin/qlibrary_unix.cpp
|
||||
+++ b/src/corelib/plugin/qlibrary_unix.cpp
|
||||
@@ -1,7 +1,7 @@
|
||||
/****************************************************************************
|
||||
**
|
||||
** Copyright (C) 2016 The Qt Company Ltd.
|
||||
-** Copyright (C) 2018 Intel Corporation
|
||||
+** Copyright (C) 2020 Intel Corporation
|
||||
** Contact: https://www.qt.io/licensing/
|
||||
**
|
||||
** This file is part of the QtCore module of the Qt Toolkit.
|
||||
@@ -218,6 +218,8 @@ bool QLibraryPrivate::load_sys()
|
||||
for(int suffix = 0; retry && !pHnd && suffix < suffixes.size(); suffix++) {
|
||||
if (!prefixes.at(prefix).isEmpty() && name.startsWith(prefixes.at(prefix)))
|
||||
continue;
|
||||
+ if (path.isEmpty() && prefixes.at(prefix).contains(QLatin1Char('/')))
|
||||
+ continue;
|
||||
if (!suffixes.at(suffix).isEmpty() && name.endsWith(suffixes.at(suffix)))
|
||||
continue;
|
||||
if (loadHints & QLibrary::LoadArchiveMemberHint) {
|
||||
--
|
||||
cgit v1.2.1
|
||||
@ -0,0 +1,90 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
QT5_MODULE="qtbase"
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="Cross-platform application development framework"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~arm ~x86"
|
||||
fi
|
||||
|
||||
IUSE="icu systemd"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/double-conversion:=
|
||||
dev-libs/glib:2
|
||||
dev-libs/libpcre2[pcre16,unicode]
|
||||
sys-libs/zlib:=
|
||||
icu? ( dev-libs/icu:= )
|
||||
!icu? ( virtual/libiconv )
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
!<dev-qt/qtcore-4.8.7-r4:4
|
||||
"
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/tools/bootstrap
|
||||
src/tools/moc
|
||||
src/tools/rcc
|
||||
src/tools/qfloat16-tables
|
||||
src/corelib
|
||||
src/tools/qlalr
|
||||
doc
|
||||
)
|
||||
|
||||
QT5_GENTOO_PRIVATE_CONFIG=(
|
||||
!:network
|
||||
!:sql
|
||||
!:testlib
|
||||
!:xml
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-CVE-2019-18281.patch"
|
||||
"${FILESDIR}/${P}-CVE-2020-0569.patch"
|
||||
"${FILESDIR}/${P}-CVE-2020-0570.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# don't add -O3 to CXXFLAGS, bug 549140
|
||||
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
|
||||
|
||||
# fix missing qt_version_tag symbol w/ LTO, bug 674382
|
||||
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
|
||||
|
||||
qt5-build_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
-no-feature-statx # bug 672856
|
||||
$(qt_use icu)
|
||||
$(qt_use !icu iconv)
|
||||
$(qt_use systemd journald)
|
||||
)
|
||||
qt5-build_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
qt5-build_src_install
|
||||
|
||||
local flags=(
|
||||
DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
|
||||
OPENGL OPENSSL SSL WIDGETS
|
||||
)
|
||||
|
||||
for flag in ${flags[@]}; do
|
||||
cat >> "${D%/}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
|
||||
|
||||
#if defined(QT_NO_${flag}) && defined(QT_${flag})
|
||||
# undef QT_NO_${flag}
|
||||
#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
|
||||
# define QT_NO_${flag}
|
||||
#endif
|
||||
_EOF_
|
||||
done
|
||||
}
|
||||
@ -0,0 +1,89 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
QT5_MODULE="qtbase"
|
||||
inherit qt5-build
|
||||
|
||||
DESCRIPTION="Cross-platform application development framework"
|
||||
|
||||
if [[ ${QT5_BUILD_TYPE} == release ]]; then
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
|
||||
fi
|
||||
|
||||
IUSE="icu systemd"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/double-conversion:=
|
||||
dev-libs/glib:2
|
||||
dev-libs/libpcre2[pcre16,unicode]
|
||||
sys-libs/zlib:=
|
||||
icu? ( dev-libs/icu:= )
|
||||
!icu? ( virtual/libiconv )
|
||||
systemd? ( sys-apps/systemd:= )
|
||||
"
|
||||
RDEPEND="${DEPEND}
|
||||
!<dev-qt/qtcore-4.8.7-r4:4
|
||||
"
|
||||
|
||||
QT5_TARGET_SUBDIRS=(
|
||||
src/tools/bootstrap
|
||||
src/tools/moc
|
||||
src/tools/rcc
|
||||
src/tools/qfloat16-tables
|
||||
src/corelib
|
||||
src/tools/qlalr
|
||||
doc
|
||||
)
|
||||
|
||||
QT5_GENTOO_PRIVATE_CONFIG=(
|
||||
!:network
|
||||
!:sql
|
||||
!:testlib
|
||||
!:xml
|
||||
)
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-5.12.3-CVE-2020-0569.patch"
|
||||
"${FILESDIR}/${PN}-5.12.3-CVE-2020-0570.patch"
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
# don't add -O3 to CXXFLAGS, bug 549140
|
||||
sed -i -e '/CONFIG\s*+=/s/optimize_full//' src/corelib/corelib.pro || die
|
||||
|
||||
# fix missing qt_version_tag symbol w/ LTO, bug 674382
|
||||
sed -i -e 's/^gcc:ltcg/gcc/' src/corelib/global/global.pri || die
|
||||
|
||||
qt5-build_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=(
|
||||
-no-feature-statx # bug 672856
|
||||
$(qt_use icu)
|
||||
$(qt_use !icu iconv)
|
||||
$(qt_use systemd journald)
|
||||
)
|
||||
qt5-build_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
qt5-build_src_install
|
||||
|
||||
local flags=(
|
||||
DBUS FREETYPE IMAGEFORMAT_JPEG IMAGEFORMAT_PNG
|
||||
OPENGL OPENSSL SSL WIDGETS
|
||||
)
|
||||
|
||||
for flag in ${flags[@]}; do
|
||||
cat >> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die
|
||||
|
||||
#if defined(QT_NO_${flag}) && defined(QT_${flag})
|
||||
# undef QT_NO_${flag}
|
||||
#elif !defined(QT_NO_${flag}) && !defined(QT_${flag})
|
||||
# define QT_NO_${flag}
|
||||
#endif
|
||||
_EOF_
|
||||
done
|
||||
}
|
||||
Binary file not shown.
@ -1,2 +1 @@
|
||||
DIST barby-0.6.7.tar.gz 95199 BLAKE2B b1729e361a41deee248a3c74c56d072fe0eeb3463ff4730744736e1a523f2844e877d63b058ec02e4cdad1f77620bcd476e823864428aff78b462cf29b20909a SHA512 29ba52612b2390ebd2a9e0acc0eec4a4c119ca305662f47e6656cb63727956877970d14f9b924466fad6e9e927e23f74c2614b41e09ca6b068bdabbaae21f93f
|
||||
DIST barby-0.6.8.tar.gz 96647 BLAKE2B b0af8e5573dc7d3d1881c793895d1c440b97bb5609b0759f56bdecfed7b4b74080f96301d2511101abb21760074584905fdc4e94938d38e2a553933686ccf976 SHA512 1d51dece22febd8c8a234241b88edd3ea93eae328e69fbd8dba3f48afcea7943ec4a72252a74b476aae5812ee132de6b87e37f9fd4c2a43d7c79ec68c831b68c
|
||||
|
||||
@ -1,99 +0,0 @@
|
||||
# Copyright 1999-2019 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
USE_RUBY="ruby24 ruby25"
|
||||
|
||||
RUBY_FAKEGEM_TASK_TEST="test"
|
||||
|
||||
RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
|
||||
|
||||
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Ruby barcode generator that doesn't rely on 3rd party libraries"
|
||||
HOMEPAGE="http://toreto.re/barby/"
|
||||
|
||||
GITHUB_USER="toretore"
|
||||
SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test qrcode rmagick prawn png cairo"
|
||||
|
||||
ruby_add_rdepend "
|
||||
rmagick? ( dev-ruby/rmagick )
|
||||
cairo? ( dev-ruby/rcairo )"
|
||||
|
||||
ruby_add_rdepend "qrcode? ( dev-ruby/rqrcode )
|
||||
png? ( dev-ruby/chunky_png )
|
||||
prawn? ( dev-ruby/prawn:* )"
|
||||
|
||||
ruby_add_bdepend "test? ( dev-ruby/minitest )"
|
||||
|
||||
# testing requires imagemagick capable of png output
|
||||
DEPEND+=" test? ( media-gfx/imagemagick[png] )"
|
||||
|
||||
# prawn breaks tests for some reasons, needs to be investigated; code
|
||||
# still works though.
|
||||
RESTRICT+=" prawn? ( test )"
|
||||
|
||||
all_ruby_prepare() {
|
||||
sed -i -e 's/README/README.md/' Rakefile || die
|
||||
|
||||
sed -i -e '/[bB]undler/s:^:#:' test/test_helper.rb || die
|
||||
|
||||
if use qrcode; then
|
||||
sed -i -e '/^end/i s.add_dependency "rqrcode"' ${RUBY_FAKEGEM_GEMSPEC}
|
||||
else
|
||||
rm \
|
||||
lib/barby/barcode/qr_code.rb \
|
||||
test/qr_code_test.rb
|
||||
fi
|
||||
|
||||
if use rmagick; then
|
||||
sed -i -e '/^end/i s.add_dependency "rmagick"' ${RUBY_FAKEGEM_GEMSPEC}
|
||||
else
|
||||
rm \
|
||||
lib/barby/outputter/rmagick_outputter.rb \
|
||||
test/outputter/rmagick_outputter_test.rb
|
||||
fi
|
||||
|
||||
if use prawn; then
|
||||
sed -i -e '/^end/i s.add_dependency "prawn"' ${RUBY_FAKEGEM_GEMSPEC}
|
||||
else
|
||||
rm \
|
||||
lib/barby/outputter/prawn_outputter.rb \
|
||||
test/outputter/prawn_outputter_test.rb
|
||||
fi
|
||||
|
||||
if use png; then
|
||||
sed -i -e '/^end/i s.add_dependency "chunky_png"' ${RUBY_FAKEGEM_GEMSPEC}
|
||||
else
|
||||
rm \
|
||||
lib/barby/outputter/png_outputter.rb \
|
||||
test/outputter/png_outputter_test.rb
|
||||
fi
|
||||
|
||||
if use cairo; then
|
||||
sed -i -e '/^end/i s.add_dependency "cairo"' ${RUBY_FAKEGEM_GEMSPEC}
|
||||
else
|
||||
rm \
|
||||
lib/barby/outputter/cairo_outputter.rb \
|
||||
test/outputter/cairo_outputter_test.rb
|
||||
fi
|
||||
|
||||
rm -f \
|
||||
lib/barby/barcode/data_matrix.rb \
|
||||
test/data_matrix_test.rb \
|
||||
lib/barby/outputter/pdfwriter_outputter.rb \
|
||||
test/outputter/pdfwriter_outputter_test.rb || die
|
||||
|
||||
sed -i \
|
||||
-e '/semacode/d' \
|
||||
-e '/pdf-writer/d' \
|
||||
${RUBY_FAKEGEM_GEMSPEC} || die
|
||||
}
|
||||
Binary file not shown.
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