Merge branch '3.3' into 3.4

This commit is contained in:
Fredrik Rinnestam 2018-02-20 21:37:59 +01:00
commit d8847d1898
34 changed files with 2067 additions and 441 deletions

View File

@ -10,6 +10,7 @@ drwxr-xr-x root/root usr/lib/
lrwxrwxrwx root/root usr/lib/libfaac.so -> libfaac.so.0.0.0
lrwxrwxrwx root/root usr/lib/libfaac.so.0 -> libfaac.so.0.0.0
-rwxr-xr-x root/root usr/lib/libfaac.so.0.0.0
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/faac.1.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/faac.1.gz

View File

@ -1,4 +1 @@
9d52a17e68fa15ca94e88e1457b94b74 faac-1.28-external-libmp4v2.patch
02b79fe7400e77f1309f51461bbe0da2 faac-1.28-inttypes.patch
979ff4f13f36217cb15c92df9fd75f0c faac-1.28-libmp4v2_r479_compat.patch
c5dde68840cefe46532089c9392d1df0 faac-1.28.tar.bz2
2b58d621fad8fda879f07b7cad8bfe10 faac-1.29.9.2.tar.gz

View File

@ -1,8 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3yKYKPb68z+Spkrd/e29VPXgGq3iFtrtY9wfiqchpbXLEbifV8frotDKhs7HriKS/02mr2vBZvOEPiNcDjBXTwc=
SHA256 (Pkgfile) = 495f3bf9667d29aebb18a6a55e7e9fef3e568c3f51fbd8f3a59011aa50cc6def
SHA256 (.footprint) = 86106db44bd92b118724628ad685a6f8fe29e3c2609bee686b7029961e57f29d
SHA256 (faac-1.28.tar.bz2) = aac475e59d38ae9e29bff760e26bf72b507ccec037a6837cc33e3ac1db3ef352
SHA256 (faac-1.28-external-libmp4v2.patch) = 8e0bfe501acb7f31a701ab2c797c2ace539ccd60e5f5b3c0ae538bcd5719c1df
SHA256 (faac-1.28-libmp4v2_r479_compat.patch) = 30033c5427b0d8f77c57eb22261a69e764399e9b67802245ca555f46bdcfff79
SHA256 (faac-1.28-inttypes.patch) = b135e8441673727a3dbfa8b5237896f985f550594406ddf71d5ad2e85437c69b
RWSagIOpLGJF39RQeyV9Am+JxArgoWEWi4UJW0gBDSUYTGupEkwxgBHrfezv0j09HJ3Ahz1irYDVnBE/UqFDjF2VF7GtenY1BQQ=
SHA256 (Pkgfile) = 0333328cbb125297082b3430fccb7b01f84e176dddca7bab60a7b1f46f8aa18d
SHA256 (.footprint) = a2b93bd1352ba7adabf902b7897be3110e8fe6e686d1d8e0cb26e5995b46cf74
SHA256 (faac-1.29.9.2.tar.gz) = d45f209d837c49dae6deebcdd87b8cc3b04ea290880358faecf5e7737740c771

View File

@ -1,27 +1,18 @@
# Description: MPEG-4 audio codecs.
# URL: http://www.audiocoding.com/
# Maintainer: Danny Rawlins, crux at romster dot me
# Packager: Matt Housh, jaeger at morpheus dot net
# Depends on: libmp4v2
name=faac
version=1.28
release=4
source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2
faac-1.28-external-libmp4v2.patch
faac-1.28-libmp4v2_r479_compat.patch
faac-1.28-inttypes.patch)
version=1.29.9.2
release=1
source=(https://sourceforge.net/projects/$name/files/$name-src/$name-${version::4}/$name-$version.tar.gz)
build() {
cd $name-$version
patch -p1 -i $SRC/faac-1.28-external-libmp4v2.patch
patch -p0 -i $SRC/faac-1.28-libmp4v2_r479_compat.patch
patch -p0 -i $SRC/faac-1.28-inttypes.patch
sed -i -e 's/^AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
./configure --prefix=/usr
./bootstrap
./configure --prefix=/usr --mandir=/usr/man
make
make DESTDIR=$PKG install
}

View File

@ -1,47 +0,0 @@
diff -ur faac-1.28.orig/configure.in faac-1.28/configure.in
--- faac-1.28.orig/configure.in 2009-02-05 02:55:38.000000000 +0200
+++ faac-1.28/configure.in 2009-07-10 13:21:34.000000000 +0300
@@ -28,14 +28,17 @@
AC_CHECK_LIB(gnugetopt, getopt_long)
AM_CONDITIONAL(WITH_MP4V2, false)
+AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false)
AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
external_mp4v2=no, -lstdc++),
- external_mp4v2=no, [#include <mp4.h>])
+ external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
if test x$external_mp4v2 = xyes; then
AC_MSG_NOTICE([*** Building with external mp4v2 ***])
+ MY_DEFINE(HAVE_LIBMP4V2)
+ AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true)
else
if test x$WITHMP4V2 = xyes; then
AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
diff -ur faac-1.28.orig/frontend/main.c faac-1.28/frontend/main.c
--- faac-1.28.orig/frontend/main.c 2009-01-24 03:10:20.000000000 +0200
+++ faac-1.28/frontend/main.c 2009-07-10 13:22:18.000000000 +0300
@@ -30,7 +30,7 @@
#endif
#ifdef HAVE_LIBMP4V2
-# include <mp4.h>
+# include <mp4v2/mp4v2.h>
#endif
#define DEFAULT_TNS 0
diff -ur faac-1.28.orig/frontend/Makefile.am faac-1.28/frontend/Makefile.am
--- faac-1.28.orig/frontend/Makefile.am 2008-12-16 02:56:00.000000000 +0200
+++ faac-1.28/frontend/Makefile.am 2009-07-10 13:21:55.000000000 +0300
@@ -8,5 +8,9 @@
LDADD = $(top_builddir)/libfaac/libfaac.la $(top_srcdir)/common/mp4v2/libmp4v2.a -lm -lstdc++
else
INCLUDES = -I$(top_srcdir)/include
+if WITH_EXTERNAL_MP4V2
+LDADD = $(top_builddir)/libfaac/libfaac.la -lm -lmp4v2
+else
LDADD = $(top_builddir)/libfaac/libfaac.la -lm
endif
+endif

View File

@ -1,41 +0,0 @@
use standard integer types, not linux ones
--- frontend/main.c
+++ frontend/main.c
@@ -440,13 +440,13 @@
MP4TrackId MP4track = 0;
unsigned int ntracks = 0, trackno = 0;
unsigned int ndiscs = 0, discno = 0;
- u_int8_t compilation = 0;
+ uint8_t compilation = 0;
const char *artist = NULL, *title = NULL, *album = NULL, *year = NULL,
*genre = NULL, *comment = NULL, *writer = NULL;
- u_int8_t *art = NULL;
- u_int64_t artSize = 0;
- u_int64_t total_samples = 0;
- u_int64_t encoded_samples = 0;
+ uint8_t *art = NULL;
+ uint64_t artSize = 0;
+ uint64_t total_samples = 0;
+ uint64_t encoded_samples = 0;
unsigned int delay_samples;
unsigned int frameSize;
#endif
@@ -647,7 +647,7 @@
FILE *artFile = fopen(optarg, "rb");
if(artFile) {
- u_int64_t r;
+ uint64_t r;
fseek(artFile, 0, SEEK_END);
artSize = ftell(artFile);
@@ -1112,7 +1112,7 @@
if (bytesWritten > 0)
{
#ifdef HAVE_LIBMP4V2
- u_int64_t samples_left = total_samples - encoded_samples + delay_samples;
+ uint64_t samples_left = total_samples - encoded_samples + delay_samples;
MP4Duration dur = samples_left > frameSize ? frameSize : samples_left;
MP4Duration ofs = encoded_samples > 0 ? 0 : delay_samples;

View File

@ -1,138 +0,0 @@
http://bugs.gentoo.org/397575
http://sourceforge.net/tracker/?func=detail&aid=3476707&group_id=704&atid=100704
--- configure.in
+++ configure.in
@@ -33,8 +33,8 @@ AC_CHECK_LIB(gnugetopt, getopt_long)
AM_CONDITIONAL(WITH_MP4V2, false)
AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, false)
-AC_CHECK_DECLS([MP4Create, MP4MetadataDelete],
- AC_CHECK_LIB(mp4v2, MP4MetadataDelete, external_mp4v2=yes,
+AC_CHECK_DECLS([MP4Create],
+ AC_CHECK_LIB(mp4v2, MP4Create, external_mp4v2=yes,
external_mp4v2=no, -lstdc++),
external_mp4v2=no, [#include <mp4v2/mp4v2.h>])
@@ -42,6 +42,7 @@ if test x$external_mp4v2 = xyes; then
AC_MSG_NOTICE([*** Building with external mp4v2 ***])
MY_DEFINE(HAVE_EXTERNAL_LIBMP4V2)
AM_CONDITIONAL(WITH_EXTERNAL_MP4V2, true)
+ AC_CHECK_DECLS([MP4TagsAlloc], [], [], [#include <mp4v2/mp4v2.h>])
else
if test x$WITHMP4V2 = xyes; then
AC_MSG_NOTICE([*** Building with internal mp4v2 ***])
--- frontend/main.c
+++ frontend/main.c
@@ -873,8 +873,12 @@ int main(int argc, char *argv[])
if (!faacEncSetConfiguration(hEncoder, myFormat)) {
fprintf(stderr, "Unsupported output format!\n");
#ifdef HAVE_LIBMP4V2
+#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
+ if (container == MP4_CONTAINER) MP4Close(MP4hFile, 0);
+#else
if (container == MP4_CONTAINER) MP4Close(MP4hFile);
#endif
+#endif
return 1;
}
@@ -885,12 +889,10 @@ int main(int argc, char *argv[])
unsigned long ASCLength = 0;
char *version_string;
-#ifdef MP4_CREATE_EXTENSIBLE_FORMAT
- /* hack to compile against libmp4v2 >= 1.0RC3
- * why is there no version identifier in mp4.h? */
+#ifdef MP4_DETAILS_ERROR /* r453 fix */
MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0);
#else
- MP4hFile = MP4Create(aacFileName, MP4_DETAILS_ERROR, 0, 0);
+ MP4hFile = MP4Create(aacFileName, 0);
#endif
if (!MP4_IS_VALID_FILE_HANDLE(MP4hFile)) {
fprintf(stderr, "Couldn't create output file %s\n", aacFileName);
@@ -905,12 +907,22 @@ int main(int argc, char *argv[])
free(ASC);
/* set metadata */
+#if HAVE_DECL_MP4TAGSALLOC
+ const MP4Tags* tags;
+ tags = MP4TagsAlloc();
+ MP4TagsFetch( tags, MP4hFile );
+#endif
version_string = malloc(strlen(faac_id_string) + 6);
strcpy(version_string, "FAAC ");
strcpy(version_string + 5, faac_id_string);
+#if !HAVE_DECL_MP4TAGSALLOC
MP4SetMetadataTool(MP4hFile, version_string);
+#else
+ MP4TagsSetEncodingTool(tags, version_string);
+#endif
free(version_string);
+#if !HAVE_DECL_MP4TAGSALLOC
if (artist) MP4SetMetadataArtist(MP4hFile, artist);
if (writer) MP4SetMetadataWriter(MP4hFile, writer);
if (title) MP4SetMetadataName(MP4hFile, title);
@@ -923,8 +935,40 @@ int main(int argc, char *argv[])
if (comment) MP4SetMetadataComment(MP4hFile, comment);
if (artSize) {
MP4SetMetadataCoverArt(MP4hFile, art, artSize);
+#else
+ if (artist) MP4TagsSetArtist(tags, artist);
+ if (writer) MP4TagsSetComposer(tags, writer);
+ if (title) MP4TagsSetName(tags, title);
+ if (album) MP4TagsSetAlbum(tags, album);
+ if (trackno > 0) {
+ MP4TagTrack tt;
+ tt.index = trackno;
+ tt.total = ntracks;
+ MP4TagsSetTrack(tags, &tt);
+ }
+ if (discno > 0) {
+ MP4TagDisk td;
+ td.index = discno;
+ td.total = ndiscs;
+ MP4TagsSetDisk(tags, &td);
+ }
+ if (compilation) MP4TagsSetCompilation(tags, compilation);
+ if (year) MP4TagsSetReleaseDate(tags, year);
+ if (genre) MP4TagsSetGenre(tags, genre);
+ if (comment) MP4TagsSetComments(tags, comment);
+ if (artSize) {
+ MP4TagArtwork mp4art;
+ mp4art.data = art;
+ mp4art.size = artSize;
+ mp4art.type = MP4_ART_UNDEFINED; // delegate typing to libmp4v2
+ MP4TagsAddArtwork( tags, &mp4art );
+#endif
free(art);
}
+#if HAVE_DECL_MP4TAGSALLOC
+ MP4TagsStore( tags, MP4hFile );
+ MP4TagsFree( tags );
+#endif
}
else
{
@@ -1141,11 +1185,19 @@ int main(int argc, char *argv[])
/* clean up */
if (container == MP4_CONTAINER)
{
+#ifdef MP4_CLOSE_DO_NOT_COMPUTE_BITRATE /* r479 fix */
+ MP4Close(MP4hFile, 0);
+#else
MP4Close(MP4hFile);
+#endif
if (optimizeFlag == 1)
{
fprintf(stderr, "\n\nMP4 format optimization... ");
+#ifdef MP4_DETAILS_ERROR /* r453 fix */
MP4Optimize(aacFileName, NULL, 0);
+#else
+ MP4Optimize(aacFileName, NULL);
+#endif
fprintf(stderr, "Done!");
}
} else

View File

@ -31,8 +31,46 @@ drwxr-xr-x root/root usr/share/FBReader/formats/xhtml/
-rw-r--r-- root/root usr/share/FBReader/formats/xhtml/xhtml-special.ent
-rw-r--r-- root/root usr/share/FBReader/formats/xhtml/xhtml-symbol.ent
drwxr-xr-x root/root usr/share/FBReader/help/
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.bg.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.cs.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.de.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.en.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.es.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.fi.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.fr.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.he.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.hu.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.id.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.it.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.lt.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.nl.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.ru.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.sv.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.uk.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.vi.fb2
-rw-r--r-- root/root usr/share/FBReader/help/MiniHelp.zh.fb2
drwxr-xr-x root/root usr/share/FBReader/resources/
-rw-r--r-- root/root usr/share/FBReader/resources/ar.xml
-rw-r--r-- root/root usr/share/FBReader/resources/bg.xml
-rw-r--r-- root/root usr/share/FBReader/resources/cs.xml
-rw-r--r-- root/root usr/share/FBReader/resources/de.xml
-rw-r--r-- root/root usr/share/FBReader/resources/en.xml
-rw-r--r-- root/root usr/share/FBReader/resources/eo.xml
-rw-r--r-- root/root usr/share/FBReader/resources/es.xml
-rw-r--r-- root/root usr/share/FBReader/resources/fi.xml
-rw-r--r-- root/root usr/share/FBReader/resources/fr.xml
-rw-r--r-- root/root usr/share/FBReader/resources/he.xml
-rw-r--r-- root/root usr/share/FBReader/resources/hu.xml
-rw-r--r-- root/root usr/share/FBReader/resources/id.xml
-rw-r--r-- root/root usr/share/FBReader/resources/it.xml
-rw-r--r-- root/root usr/share/FBReader/resources/lt.xml
-rw-r--r-- root/root usr/share/FBReader/resources/nl.xml
-rw-r--r-- root/root usr/share/FBReader/resources/pl.xml
-rw-r--r-- root/root usr/share/FBReader/resources/ru.xml
-rw-r--r-- root/root usr/share/FBReader/resources/sv.xml
-rw-r--r-- root/root usr/share/FBReader/resources/uk.xml
-rw-r--r-- root/root usr/share/FBReader/resources/vi.xml
-rw-r--r-- root/root usr/share/FBReader/resources/zh.xml
drwxr-xr-x root/root usr/share/applications/
-rw-r--r-- root/root usr/share/applications/FBReader.desktop
drwxr-xr-x root/root usr/share/man/

View File

@ -1,4 +1,3 @@
bc8975fc8235f393ef011b564addf300 FBReader-0.99.4-fix-crash-with-fb2.zip-files.patch
3547e229b21a2363bda4d13b88b54414 FBReader.desktop
7db7def01b52f8e3f8890183a5f6f405 fbreader-0.99.4-gcc6-Wno-narrowing.diff
709623c5cdf84f2b626cc04318fa8503 fbreader-0.99.4.patch
ed13a9c3aeb68aaa98a1dd6f7947a31d fbreader-sources-0.99.4.tgz

View File

@ -1,8 +1,7 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF35FQkklsroxnVafMvuiIV10j2czBXhLzX03C2fWchrNjNoEFUiKAGy/6eWVTaAvS7K5jFIxunjT0SfAcQIJljgc=
SHA256 (Pkgfile) = a4e4cbd68c7c788779da3e402c00086f933aedbdfc1be1e37fa2a9bef2c19710
SHA256 (.footprint) = f64f710cb5f3c5a575ce08dc06c31a59f3e2026d0fa5bab0ae18b2dbb3bd74bb
RWSagIOpLGJF3ynWzYHsYOhQ4mskd545UvZZdaOZhi4LOlPVrPF+YmL+vpNt1ACz0vnyYa13RCRTQyngwCmXc3j3E6/5MZohQA8=
SHA256 (Pkgfile) = a8db37587e276032992299ba902687eca5e111da6d5d077f1e1f403715f0cb01
SHA256 (.footprint) = 15515f92137f0de89716adfb58a1ebf570cb1142618d6363c86d4f3db69d4fff
SHA256 (fbreader-sources-0.99.4.tgz) = 3d7c31d5ea314589d2a963290ad16f4d3d631a41e802b8b39f8be0c9f71eb8e9
SHA256 (FBReader-0.99.4-fix-crash-with-fb2.zip-files.patch) = cb3aa6795c8f7c694ba296f6f6e6a7939648578a289bc84c10f8302c7e72df86
SHA256 (fbreader-0.99.4-gcc6-Wno-narrowing.diff) = 83129305fc6d3b4ab999ed9e232e6173e189a33b4ce82364a47848e2644cccfa
SHA256 (fbreader-0.99.4.patch) = 1b967d15b6561f81f95d7fde6bf53a6aa4f1d8e3f3320a2d7a353f4c6f6543fc
SHA256 (FBReader.desktop) = b42e9af54e72a38ad4854aace54f19f90602d3dc9b9e816e0fed803c8e4c3772

View File

@ -1,8 +0,0 @@
diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
--- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp 2012-11-30 19:41:25.000000000 +0700
+++ fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp 2013-02-21 13:30:31.000000000 +0700
@@ -49,3 +49,4 @@
path = replacement + path.substr(1);
}
+ ZLUnixFSManager::normalizeRealPath(path);
}

View File

@ -1,24 +1,35 @@
# Description: An e-book reader for Linux
# URL: http://www.fbreader.org/
# Maintainer: Pedja, predivan at mts dot rs
# Depends on: curl fribidi libunibreak sqlite3 qt4
# Depends on: fribidi libunibreak qt4
name=fbreader
version=0.99.4
release=1
release=2
source=(http://fbreader.org/files/desktop/fbreader-sources-$version.tgz
FBReader-0.99.4-fix-crash-with-fb2.zip-files.patch
fbreader-0.99.4-gcc6-Wno-narrowing.diff
fbreader-0.99.4.patch
FBReader.desktop)
build () {
cd $name-$version
export TARGET_ARCH=desktop
export UI_TYPE=qt4
export TARGET_STATUS=release
patch -p1 -i $SRC/FBReader-0.99.4-fix-crash-with-fb2.zip-files.patch
patch -p0 -i $SRC/fbreader-0.99.4-gcc6-Wno-narrowing.diff
# export CFLAGS="${CFLAGS} -std=c++11"
patch -p1 -i $SRC/fbreader-0.99.4.patch
# Respect *FLAGS
sed -e "s/^CFLAGS = -pipe/CFLAGS +=/" \
-i makefiles/arch/desktop.mk
sed -e "/^ CFLAGS +=/ d" \
-i makefiles/config.mk
sed -e "/^ LDFLAGS += -s$/ d" \
-i makefiles/config.mk
sed -e "/^LDFLAGS =$/ d" \
-i makefiles/arch/desktop.mk
echo "TARGET_ARCH = desktop" > makefiles/target.mk
echo "UI_TYPE = qt4" >> makefiles/target.mk
echo "TARGET_STATUS = release" >> makefiles/target.mk
make
make DESTDIR=$PKG install
@ -27,7 +38,4 @@ build () {
mkdir -p $PKG/usr/share/applications/
install -m644 $SRC/FBReader.desktop $PKG/usr/share/applications/FBReader.desktop
find $PKG/usr/share/FBReader/help ! -name *.en.fb2 -exec rm '{}' \;
find $PKG/usr/share/FBReader/resources ! -name *.en.xml -exec rm '{}' \;
}

View File

@ -1,10 +0,0 @@
--- makefiles/config.mk.orig 2012-11-30 15:41:25.000000000 +0300
+++ makefiles/config.mk 2016-06-23 20:30:42.652441840 +0300
@@ -21,6 +21,7 @@
ARCHIVER_LIBS ?= -lz -lbz2
CFLAGS += -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\"
+CFLAGS += -Wno-narrowing
ifeq "$(ZLSHARED)" "yes"
CFLAGS += -fPIC -DZLSHARED
endif

View File

@ -0,0 +1,61 @@
diff -Naur fbreader-0.99.4/fbreader/desktop/desktop fbreader-0.99.4-new/fbreader/desktop/desktop
--- fbreader-0.99.4/fbreader/desktop/desktop 2012-11-30 13:41:25.000000000 +0100
+++ fbreader-0.99.4-new/fbreader/desktop/desktop 2018-02-19 17:21:15.232343234 +0100
@@ -21,3 +21,4 @@
Type=Application
Icon=FBReader
Categories=Office;Viewer;Literature;
+MimeType=application/epub+zip;application/rtf;application/x-fictionbook+xml;application/x-zip-compressed-fb2;application/x-mobipocket-ebook;application/xhtml+xml;text/html;text/plain;
diff -Naur fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp fbreader-0.99.4-new/fbreader/src/formats/doc/OleStorage.cpp
--- fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp 2012-11-30 13:41:25.000000000 +0100
+++ fbreader-0.99.4-new/fbreader/src/formats/doc/OleStorage.cpp 2018-02-19 17:20:53.327387155 +0100
@@ -59,7 +59,7 @@
clear();
return false;
}
- static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0};
+ static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0};
if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) {
clear();
return false;
diff -Naur fbreader-0.99.4/makefiles/config.mk fbreader-0.99.4-new/makefiles/config.mk
--- fbreader-0.99.4/makefiles/config.mk 2012-11-30 13:41:25.000000000 +0100
+++ fbreader-0.99.4-new/makefiles/config.mk 2018-02-19 17:19:25.261563732 +0100
@@ -21,6 +21,7 @@
ARCHIVER_LIBS ?= -lz -lbz2
CFLAGS += -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\"
+CFLAGS += -Wno-narrowing
ifeq "$(ZLSHARED)" "yes"
CFLAGS += -fPIC -DZLSHARED
endif
diff -Naur fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4-new/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
--- fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp 2012-11-30 13:41:25.000000000 +0100
+++ fbreader-0.99.4-new/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp 2018-02-19 17:19:43.699526763 +0100
@@ -48,4 +48,5 @@
static const std::string replacement = (const char*)QDir::homePath().toUtf8();
path = replacement + path.substr(1);
}
+ ZLUnixFSManager::normalizeRealPath(path);
}
diff -Naur fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4-new/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp
--- fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2012-11-30 13:41:25.000000000 +0100
+++ fbreader-0.99.4-new/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp 2018-02-19 17:21:23.657326342 +0100
@@ -86,7 +86,7 @@
}
void QtWaitingSpinner::setRoundness(qreal roundness) {
- myRoundness = std::max(0.0, std::min(100.0, roundness));
+ myRoundness = std::max(static_cast<qreal>(0.0), std::min(static_cast<qreal>(100.0), roundness));
}
void QtWaitingSpinner::setColor(QColor color) {
@@ -148,7 +148,7 @@
qreal alphaDiff = color.alphaF() - (qreal)minAlphaF;
qreal gradation = alphaDiff / (qreal)(distanceThreshold + 1);
qreal resultAlpha = color.alphaF() - gradation * distance;
- resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds
+ resultAlpha = std::min(static_cast<qreal>(1.0), std::max(static_cast<qreal>(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds
color.setAlphaF(resultAlpha);
return color;
}

View File

@ -48,18 +48,12 @@ drwxr-xr-x root/root usr/lib/glade/modules/
-rwxr-xr-x root/root usr/lib/glade/modules/libgladegtk.la
-rwxr-xr-x root/root usr/lib/glade/modules/libgladegtk.so
-rwxr-xr-x root/root usr/lib/libgladeui-2.la
lrwxrwxrwx root/root usr/lib/libgladeui-2.so -> libgladeui-2.so.6.1.3
lrwxrwxrwx root/root usr/lib/libgladeui-2.so.6 -> libgladeui-2.so.6.1.3
-rwxr-xr-x root/root usr/lib/libgladeui-2.so.6.1.3
lrwxrwxrwx root/root usr/lib/libgladeui-2.so -> libgladeui-2.so.6.4.1
lrwxrwxrwx root/root usr/lib/libgladeui-2.so.6 -> libgladeui-2.so.6.4.1
-rwxr-xr-x root/root usr/lib/libgladeui-2.so.6.4.1
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/gladeui-2.0.pc
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/glade-previewer.1.gz
-rw-r--r-- root/root usr/man/man1/glade.1.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/appdata/
-rw-r--r-- root/root usr/share/appdata/glade.appdata.xml
drwxr-xr-x root/root usr/share/applications/
-rw-r--r-- root/root usr/share/applications/glade.desktop
drwxr-xr-x root/root usr/share/gir-1.0/
@ -81,6 +75,7 @@ drwxr-xr-x root/root usr/share/glade/pixmaps/hicolor/16x16/actions/
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-accelgroup.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-accellabel.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-action.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-actionbar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-actiongroup.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-adjustment.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-alignment.png
@ -123,6 +118,8 @@ drwxr-xr-x root/root usr/share/glade/pixmaps/hicolor/16x16/actions/
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserwidget.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-filefilter.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-fixed.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-flowbox.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-flowboxchild.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-fontbutton.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-fontselection.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-fontselectiondialog.png
@ -131,6 +128,7 @@ drwxr-xr-x root/root usr/share/glade/pixmaps/hicolor/16x16/actions/
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-handlebox.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hbox.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hbuttonbox.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-headerbar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hpaned.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hscale.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-hscrollbar.png
@ -148,18 +146,22 @@ drwxr-xr-x root/root usr/share/glade/pixmaps/hicolor/16x16/actions/
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-listbox.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-listboxrow.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-liststore.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-lockbutton.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menu.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menubar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menubutton.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menuitem.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-menutoolbutton.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-messagedialog.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-modelbutton.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-notebook.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-offscreenwindow.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-overlay.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-pagesetupdialog.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-paned.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-placessidebar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-popover.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-popovermenu.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-printdialog.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-progressbar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-radioaction.png
@ -177,6 +179,7 @@ drwxr-xr-x root/root usr/share/glade/pixmaps/hicolor/16x16/actions/
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-scalebutton.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-scrollbar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-scrolledwindow.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-searchbar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-searchentry.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-separator.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-separatormenuitem.png
@ -184,6 +187,9 @@ drwxr-xr-x root/root usr/share/glade/pixmaps/hicolor/16x16/actions/
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-sizegroup.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-spinbutton.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-spinner.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-stack.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-stacksidebar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-stackswitcher.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-statusbar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-statusicon.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/16x16/actions/widget-gtk-switch.png
@ -223,6 +229,7 @@ drwxr-xr-x root/root usr/share/glade/pixmaps/hicolor/22x22/actions/
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-accelgroup.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-accellabel.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-action.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-actionbar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-actiongroup.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-adjustment.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-alignment.png
@ -265,6 +272,8 @@ drwxr-xr-x root/root usr/share/glade/pixmaps/hicolor/22x22/actions/
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserwidget.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-filefilter.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-fixed.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-flowbox.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-flowboxchild.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-fontbutton.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-fontselection.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-fontselectiondialog.png
@ -273,6 +282,7 @@ drwxr-xr-x root/root usr/share/glade/pixmaps/hicolor/22x22/actions/
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-handlebox.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hbox.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hbuttonbox.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-headerbar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hpaned.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hscale.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-hscrollbar.png
@ -290,18 +300,22 @@ drwxr-xr-x root/root usr/share/glade/pixmaps/hicolor/22x22/actions/
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-listbox.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-listboxrow.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-liststore.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-lockbutton.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menu.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menubar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menubutton.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menuitem.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-menutoolbutton.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-messagedialog.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-modelbutton.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-notebook.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-offscreenwindow.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-overlay.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-pagesetupdialog.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-paned.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-placessidebar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-popover.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-popovermenu.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-printdialog.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-progressbar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-radioaction.png
@ -319,6 +333,7 @@ drwxr-xr-x root/root usr/share/glade/pixmaps/hicolor/22x22/actions/
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-scalebutton.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-scrollbar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-scrolledwindow.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-searchbar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-searchentry.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-separator.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-separatormenuitem.png
@ -326,6 +341,9 @@ drwxr-xr-x root/root usr/share/glade/pixmaps/hicolor/22x22/actions/
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-sizegroup.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-spinbutton.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-spinner.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-stack.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-stacksidebar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-stackswitcher.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-statusbar.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-statusicon.png
-rw-r--r-- root/root usr/share/glade/pixmaps/hicolor/22x22/actions/widget-gtk-switch.png
@ -452,12 +470,24 @@ drwxr-xr-x root/root usr/share/help/ja/glade/figures/
lrwxrwxrwx root/root usr/share/help/ja/glade/figures/main-window.png -> /usr/share/help/C/glade/figures/main-window.png
-rw-r--r-- root/root usr/share/help/ja/glade/index.docbook
-rw-r--r-- root/root usr/share/help/ja/glade/legal.xml
drwxr-xr-x root/root usr/share/help/ko/
drwxr-xr-x root/root usr/share/help/ko/glade/
drwxr-xr-x root/root usr/share/help/ko/glade/figures/
lrwxrwxrwx root/root usr/share/help/ko/glade/figures/main-window.png -> /usr/share/help/C/glade/figures/main-window.png
-rw-r--r-- root/root usr/share/help/ko/glade/index.docbook
-rw-r--r-- root/root usr/share/help/ko/glade/legal.xml
drwxr-xr-x root/root usr/share/help/oc/
drwxr-xr-x root/root usr/share/help/oc/glade/
drwxr-xr-x root/root usr/share/help/oc/glade/figures/
-rw-r--r-- root/root usr/share/help/oc/glade/figures/main-window.png
-rw-r--r-- root/root usr/share/help/oc/glade/index.docbook
-rw-r--r-- root/root usr/share/help/oc/glade/legal.xml
drwxr-xr-x root/root usr/share/help/pl/
drwxr-xr-x root/root usr/share/help/pl/glade/
drwxr-xr-x root/root usr/share/help/pl/glade/figures/
-rw-r--r-- root/root usr/share/help/pl/glade/figures/main-window.png
-rw-r--r-- root/root usr/share/help/pl/glade/index.docbook
-rw-r--r-- root/root usr/share/help/pl/glade/legal.xml
drwxr-xr-x root/root usr/share/help/pt_BR/
drwxr-xr-x root/root usr/share/help/pt_BR/glade/
drwxr-xr-x root/root usr/share/help/pt_BR/glade/figures/
@ -514,3 +544,12 @@ drwxr-xr-x root/root usr/share/icons/hicolor/32x32/apps/
drwxr-xr-x root/root usr/share/icons/hicolor/48x48/
drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/
-rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/glade.png
drwxr-xr-x root/root usr/share/icons/hicolor/scalable/
drwxr-xr-x root/root usr/share/icons/hicolor/scalable/apps/
-rw-r--r-- root/root usr/share/icons/hicolor/scalable/apps/glade-symbolic.svg
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/glade-previewer.1.gz
-rw-r--r-- root/root usr/share/man/man1/glade.1.gz
drwxr-xr-x root/root usr/share/metainfo/
-rw-r--r-- root/root usr/share/metainfo/glade.appdata.xml

View File

@ -1 +1 @@
6852d6286683728e0ea40ca9b5d2416f glade-3.18.3.tar.xz
2cd887d2ad6f36e791fb9e9ee06eadbd glade-3.20.3.tar.xz

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF37s3mGemNECCO7n9jHIUEgHBqWieEt8HnC73X7OmVbk60cSve6CpJu0k/1qhbDUgjLpX4sH2xTMS/ECNZQWmIgY=
SHA256 (Pkgfile) = 0d4011f8f498fec84b05f27ffadd4633ef989b2f072e676d081b58eaae4d7eb0
SHA256 (.footprint) = e247b26160f0f14cdbd35c74d95aa092370e3f6f8d772afa22d1b8f9b6d6b539
SHA256 (glade-3.18.3.tar.xz) = ecdbce46e7fbfecd463be840b94fbf54d83723b3ebe075414cfd225ddab66452
RWSagIOpLGJF32Jy6FhaZnr4orcCoiAZbNaLjAtbiKruGMy3Zx9Auj3rDUcwR7KuflTjxP4PKAwSXkSvMgaj6jM6RIV9j/wgVwg=
SHA256 (Pkgfile) = 0ca2b3a824e2b2c1aaf58c043ad2a6fc4b7346ed863fc877a25f7efcfe2f0c73
SHA256 (.footprint) = 5708be3bd16eeb72aeca7231d9d4d2cc3bc6f5aa165a800275931ab5e145f56c
SHA256 (glade-3.20.3.tar.xz) = 1739d5478fc54ec8174ff3faa8026053c21c6a10fe38a49c66138f9deada08d4

View File

@ -5,16 +5,15 @@
# Depends on: docbook-xsl gtk3 itstool libglade
name=glade
version=3.18.3
version=3.20.3
release=1
source=(http://ftp.gnome.org/pub/GNOME/sources/$name/${version::4}/$name-$version.tar.xz)
source=(https://ftp.gnome.org/pub/GNOME/sources/$name/${version::4}/$name-$version.tar.xz)
build() {
cd $name-$version
./configure \
--prefix=/usr \
--mandir=/usr/man \
--disable-gtk-doc-html \
--disable-nls

File diff suppressed because it is too large Load Diff

View File

@ -1,3 +1,3 @@
a121383b430da9050355544d132d8630 go-certpath.diff
07cbb9d0091b846c6aea40bf5bc0cea7 go1.10.src.tar.gz
814fad4ac7dedfb5e286df83cdc7fc21 go1.4.3.linux-amd64.tar.gz
6816441fd6680c63865cdd5cb8bc1960 go1.9.4.src.tar.gz

View File

@ -1,7 +1,7 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF360HLXusbweeoPBrS1djP2KZysE/G2P6uC4c1keSjMSSbQVcDbOv41STVkNAF337gruvfY6nsGv7sPVMB5qq2QY=
SHA256 (Pkgfile) = c728261af4686ac7c217b09e01b71c3027ea5195f069c78c87327a5c45673c0c
SHA256 (.footprint) = 89cb54f2c0d8d236f309d5bcc5e9d1dd7d641dcb4902e829d6be3f9ebcb06393
RWSagIOpLGJF31Y30SGXJXl+hppj2H8vx0KBetq8/mSqZAkblsaaFEPaQ8z1TCC7nOewZSboZCLp/l+bZhg9+gPLSleVhAOtCAM=
SHA256 (Pkgfile) = 95b7451813735c06da2887a9ade96a321459d9c12dba47846349dd6a8adfc23b
SHA256 (.footprint) = 1ebad2b0052db782407335220ac7af5e127aa0dc5bc13eadbfcfb6f413817b21
SHA256 (go1.4.3.linux-amd64.tar.gz) = ce3140662f45356eb78bc16a88fc7cfb29fb00e18d7c632608245b789b2086d2
SHA256 (go1.9.4.src.tar.gz) = 0573a8df33168977185aa44173305e5a0450f55213600e94541604b75d46dc06
SHA256 (go1.10.src.tar.gz) = f3de49289405fda5fd1483a8fe6bd2fa5469e005fd567df64485c4fa000c7f24
SHA256 (go-certpath.diff) = 3907aed875a3d4e19dfb9aa2aa5b6c4aea821637c8d6f0dd0af54a4e99e8309f

View File

@ -3,7 +3,7 @@
# Maintainer: Matt Housh, jaeger at crux dot ninja
name=go
version=1.9.4
version=1.10
release=1
source=(https://storage.googleapis.com/golang/go1.4.3.linux-amd64.tar.gz \
https://storage.googleapis.com/golang/${name}${version}.src.tar.gz \

View File

@ -30,9 +30,10 @@ drwxr-xr-x root/root usr/lib/python2.7/site-packages/attr/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/attr/validators.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/attr/validators.pyc
-rw-r--r-- root/root usr/lib/python2.7/site-packages/attr/validators.pyo
drwxr-xr-x root/root usr/lib/python2.7/site-packages/attrs-17.3.0-py2.7.egg-info/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/attrs-17.3.0-py2.7.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python2.7/site-packages/attrs-17.3.0-py2.7.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/attrs-17.3.0-py2.7.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/attrs-17.3.0-py2.7.egg-info/not-zip-safe
-rw-r--r-- root/root usr/lib/python2.7/site-packages/attrs-17.3.0-py2.7.egg-info/top_level.txt
drwxr-xr-x root/root usr/lib/python2.7/site-packages/attrs-17.4.0-py2.7.egg-info/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/attrs-17.4.0-py2.7.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python2.7/site-packages/attrs-17.4.0-py2.7.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/attrs-17.4.0-py2.7.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/attrs-17.4.0-py2.7.egg-info/not-zip-safe
-rw-r--r-- root/root usr/lib/python2.7/site-packages/attrs-17.4.0-py2.7.egg-info/requires.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/attrs-17.4.0-py2.7.egg-info/top_level.txt

View File

@ -1 +1 @@
4314f784ca3174d91956da9828248960 attrs-17.3.0.tar.gz
d7a89063b2e0fd36bd82389c4d82821d attrs-17.4.0.tar.gz

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF30OjeshWvvnkf8G7rwn3hxZa9eD3we7NlcOPp+v53myA79FWsQa5WD4POrZCnmVbXLqotoWBy9b/8sHZuJXl7w4=
SHA256 (Pkgfile) = 38fdf0e9f835a97c18b995a7e38cd455fe63466d69237c1c92440e7bbbfe4c43
SHA256 (.footprint) = 1db22627ab8ebbbca0563f3d36695b48c77435f4e7667a2258e083b16ef679b2
SHA256 (attrs-17.3.0.tar.gz) = c78f53e32d7cf36d8597c8a2c7e3c0ad210f97b9509e152e4c37fa80869f823c
RWSagIOpLGJF3/lmEuomJOZ6GPSypV20nDU66ZBDqS22wtLPzZbnvkWXwb55WNlxZco0zXF5WKBr6NNAorc8lzcX/YvckiJA/AM=
SHA256 (Pkgfile) = 6b797f7362849d63e00689b9c7895baba2e88f34e6db0b8f4e74cb0753deab5f
SHA256 (.footprint) = 86b7c658b4bf685a70f48bcd8d21a71ab564eaabe13208dfa26d76550e205470
SHA256 (attrs-17.4.0.tar.gz) = 1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9

View File

@ -4,7 +4,7 @@
# Depends on: python-setuptools
name=python-attrs
version=17.3.0
version=17.4.0
release=1
source=(https://files.pythonhosted.org/packages/source/${name:7:1}/${name#*-}/${name#*-}-$version.tar.gz)

View File

@ -3,14 +3,14 @@ drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/python2.7/
drwxr-xr-x root/root usr/lib/python2.7/site-packages/
-rwxr-xr-x root/root usr/lib/python2.7/site-packages/_cffi_backend.so
drwxr-xr-x root/root usr/lib/python2.7/site-packages/cffi-1.11.2-py2.7.egg-info/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi-1.11.2-py2.7.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi-1.11.2-py2.7.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi-1.11.2-py2.7.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi-1.11.2-py2.7.egg-info/entry_points.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi-1.11.2-py2.7.egg-info/not-zip-safe
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi-1.11.2-py2.7.egg-info/requires.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi-1.11.2-py2.7.egg-info/top_level.txt
drwxr-xr-x root/root usr/lib/python2.7/site-packages/cffi-1.11.4-py2.7.egg-info/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi-1.11.4-py2.7.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi-1.11.4-py2.7.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi-1.11.4-py2.7.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi-1.11.4-py2.7.egg-info/entry_points.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi-1.11.4-py2.7.egg-info/not-zip-safe
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi-1.11.4-py2.7.egg-info/requires.txt
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi-1.11.4-py2.7.egg-info/top_level.txt
drwxr-xr-x root/root usr/lib/python2.7/site-packages/cffi/
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi/__init__.py
-rw-r--r-- root/root usr/lib/python2.7/site-packages/cffi/__init__.pyc

View File

@ -1 +1 @@
a731487324b501c8295221b629d3f5f3 cffi-1.11.2.tar.gz
8ef0f852498908b20bc508799901fe93 cffi-1.11.4.tar.gz

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF36FsYFO5u8pzLpcJcN4+iXNj2k/DKfvOjVXeEH6Z7S03buk0aIk/YPl9qzFTfp5iQ65N1sF69spjxLtTnFOO2Q4=
SHA256 (Pkgfile) = 1262882d3f28aaefaccef8bdd52bed4b02a95374b29e6c827391d4823d5943b0
SHA256 (.footprint) = 0299f433d9f2eb2f7eec8b5fe75c86a5279866c0ae0e2e51b979367fd9a0a813
SHA256 (cffi-1.11.2.tar.gz) = ab87dd91c0c4073758d07334c1e5f712ce8fe48f007b86f8238773963ee700a6
RWSagIOpLGJF3zxHRCsm0AR71ZbubjrUs2k3LbbvyE6M86RkvebgTZX3TSvuHGud4pzhZ9fAEennLWbk6hWWJVT2RHml1kTPZwc=
SHA256 (Pkgfile) = 8a38c62f465173425946aeee9cda60cb3d8822cd25c7d1d0fb81b42bd39772cf
SHA256 (.footprint) = 2681033a90f436048a073e7ead2ffeffe37c64f4588fc9e257813e4a51d9261a
SHA256 (cffi-1.11.4.tar.gz) = df9083a992b17a28cd4251a3f5c879e0198bb26c9e808c4647e0a18739f1d11d

View File

@ -4,7 +4,7 @@
# Depends on: libffi pycparser
name=python-cffi
version=1.11.2
version=1.11.4
release=1
source=(https://files.pythonhosted.org/packages/source/${name:7:1}/${name#*-}/${name#*-}-$version.tar.gz)

View File

@ -31,9 +31,10 @@ drwxr-xr-x root/root usr/lib/python3.6/site-packages/attr/__pycache__/
-rw-r--r-- root/root usr/lib/python3.6/site-packages/attr/exceptions.py
-rw-r--r-- root/root usr/lib/python3.6/site-packages/attr/filters.py
-rw-r--r-- root/root usr/lib/python3.6/site-packages/attr/validators.py
drwxr-xr-x root/root usr/lib/python3.6/site-packages/attrs-17.3.0-py3.6.egg-info/
-rw-r--r-- root/root usr/lib/python3.6/site-packages/attrs-17.3.0-py3.6.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python3.6/site-packages/attrs-17.3.0-py3.6.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python3.6/site-packages/attrs-17.3.0-py3.6.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python3.6/site-packages/attrs-17.3.0-py3.6.egg-info/not-zip-safe
-rw-r--r-- root/root usr/lib/python3.6/site-packages/attrs-17.3.0-py3.6.egg-info/top_level.txt
drwxr-xr-x root/root usr/lib/python3.6/site-packages/attrs-17.4.0-py3.6.egg-info/
-rw-r--r-- root/root usr/lib/python3.6/site-packages/attrs-17.4.0-py3.6.egg-info/PKG-INFO
-rw-r--r-- root/root usr/lib/python3.6/site-packages/attrs-17.4.0-py3.6.egg-info/SOURCES.txt
-rw-r--r-- root/root usr/lib/python3.6/site-packages/attrs-17.4.0-py3.6.egg-info/dependency_links.txt
-rw-r--r-- root/root usr/lib/python3.6/site-packages/attrs-17.4.0-py3.6.egg-info/not-zip-safe
-rw-r--r-- root/root usr/lib/python3.6/site-packages/attrs-17.4.0-py3.6.egg-info/requires.txt
-rw-r--r-- root/root usr/lib/python3.6/site-packages/attrs-17.4.0-py3.6.egg-info/top_level.txt

View File

@ -1 +1 @@
4314f784ca3174d91956da9828248960 attrs-17.3.0.tar.gz
d7a89063b2e0fd36bd82389c4d82821d attrs-17.4.0.tar.gz

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/contrib.pub
RWSagIOpLGJF3708/emuV09tCEdaMZNDGZIM22xHIDDviykhVAUVi087hIiSPp2bUz5fcHKSJvFZ8WBOnemmopOFQo1mZ86HaQU=
SHA256 (Pkgfile) = 8ef65faed8f0c89f1758809a00e2b6047c649d9ce1aefa78dbc8d292f8ee8445
SHA256 (.footprint) = 46d06a634775e3813328a92a7388709994f2e15a70aff35c43a5cd759498d1b5
SHA256 (attrs-17.3.0.tar.gz) = c78f53e32d7cf36d8597c8a2c7e3c0ad210f97b9509e152e4c37fa80869f823c
RWSagIOpLGJF3/C0zbhmvOKEjVuuwQnKSvU2M7G9dVSeK8iUaETKmNP8sC9uwJjgZsELiJjfvWY08eEo/yKSTNr4YQji5c8AGAE=
SHA256 (Pkgfile) = 79c87b64c71213fa43febb46543bd90cfce3bf3aa998d7ecb514caf9c9f6e5a8
SHA256 (.footprint) = 5edf50e6281019b4dc355359d5e69ee9a3780738bfc2a2ac646174ea40a1d132
SHA256 (attrs-17.4.0.tar.gz) = 1c7960ccfd6a005cd9f7ba884e6316b5e430a3f1a6c37c5f87d8b43f83b54ec9

View File

@ -4,7 +4,7 @@
# Depends on: python3-setuptools
name=python3-attrs
version=17.3.0
version=17.4.0
release=1
source=(https://files.pythonhosted.org/packages/source/${name:8:1}/${name#*-}/${name#*-}-$version.tar.gz)