Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (58129e6b8857bf1d0e166f8f9e94c4a332742249)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (58129e6b8857bf1d0e166f8f9e94c4a332742249)
  • Date: Sun, 19 Jul 2015 18:43:00 +0000

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

accounts-sso/libaccounts-glib/DEPENDS | 2 -
accounts-sso/libaccounts-glib/DETAILS | 11 ++++---
accounts-sso/libaccounts-glib/HISTORY | 6 +++
accounts-sso/libaccounts-glib/PRE_BUILD | 7 ----
qt5/qtwebengine/CONFLICTS | 1
qt5/qtwebengine/DEPENDS | 3 +
qt5/qtwebengine/HISTORY | 5 +++
qt5/qtwebengine/PRE_BUILD | 4 ++
qt5/qtwebengine/jpeg.diff | 49
++++++++++++++++++++++++++++++++
9 files changed, 76 insertions(+), 12 deletions(-)

New commits:
commit 58129e6b8857bf1d0e166f8f9e94c4a332742249
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qtwebengine - fix build

commit 026cd74068aa0db9b8f722830d241d314f492520
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

libaccounts-glib: => master

diff --git a/accounts-sso/libaccounts-glib/DEPENDS
b/accounts-sso/libaccounts-glib/DEPENDS
index e2cbc2f..a57de5e 100755
--- a/accounts-sso/libaccounts-glib/DEPENDS
+++ b/accounts-sso/libaccounts-glib/DEPENDS
@@ -3,5 +3,5 @@ depends libxslt &&
depends libxml2 &&
depends pkgconfig &&
depends sqlite &&
-optional_depends gtk-doc '--enable-gtk-doc' '--disable-gtk-doc' 'build
documentation'
+depends gtk-doc

diff --git a/accounts-sso/libaccounts-glib/DETAILS
b/accounts-sso/libaccounts-glib/DETAILS
index c4efca4..c08cf40 100755
--- a/accounts-sso/libaccounts-glib/DETAILS
+++ b/accounts-sso/libaccounts-glib/DETAILS
@@ -1,5 +1,5 @@
SPELL=libaccounts-glib
- VERSION=1.18
+ VERSION=master
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
WEB_SITE=https://gitlab.com/accounts-sso/$SPELL
SOURCE_URL[0]=$WEB_SITE.git
@@ -8,7 +8,10 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
KEYWORDS=""
SHORT=""
cat << EOF
-The Accounts & SSO framework consists of a set of components and libraries
which implement an account
-manager for a user's online accounts and a single-sign-on daemon which
handles the authentication to the
-remote services on behalf of the client applications.
+Accounts management library for GLib applications
+-------------------------------------------------
+
+This project is a library for managing accounts which can be used from GLib
+applications. It is part of the accounts-sso project:
+
EOF
diff --git a/accounts-sso/libaccounts-glib/HISTORY
b/accounts-sso/libaccounts-glib/HISTORY
index f91ba2c..bb3de83 100644
--- a/accounts-sso/libaccounts-glib/HISTORY
+++ b/accounts-sso/libaccounts-glib/HISTORY
@@ -1,3 +1,9 @@
+2015-07-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version master
+ previous version no longer builds
+ update DESC
+ * DEPENDS, PRE_BUILD: gtk-doc is required
+
2015-06-14 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.18
now at gitlab
diff --git a/accounts-sso/libaccounts-glib/PRE_BUILD
b/accounts-sso/libaccounts-glib/PRE_BUILD
index 185d86f..f1988dd 100755
--- a/accounts-sso/libaccounts-glib/PRE_BUILD
+++ b/accounts-sso/libaccounts-glib/PRE_BUILD
@@ -1,10 +1,5 @@
source $GRIMOIRE/clone_single_branch &&
clone_single_branch &&
cd $SOURCE_DIRECTORY &&
-if is_depends_enabled $SPELL gtk-doc;then
- gtkdocize --copy --flavour no-tmpl
-else
- sed -i '/SUBDIRS/s/docs//' Makefile.am &&
- sed -i '/docs/D;/GTK/D' configure.ac
-fi &&
+gtkdocize --copy --flavour no-tmpl
autoreconf -f -i --symlink
diff --git a/qt5/qtwebengine/CONFLICTS b/qt5/qtwebengine/CONFLICTS
new file mode 100755
index 0000000..7821c6b
--- /dev/null
+++ b/qt5/qtwebengine/CONFLICTS
@@ -0,0 +1 @@
+conflicts qtwebengine y
diff --git a/qt5/qtwebengine/DEPENDS b/qt5/qtwebengine/DEPENDS
index 1d624d2..2411e1e 100755
--- a/qt5/qtwebengine/DEPENDS
+++ b/qt5/qtwebengine/DEPENDS
@@ -3,6 +3,7 @@ depends qtbase &&
depends qtxmlpatterns &&
depends qtdeclarative &&
depends qtquickcontrols &&
+depends qtwebchannel &&
depends bison &&
depends perl &&
depends pkgconfig &&
@@ -10,6 +11,7 @@ depends pkgconfig &&
depends python &&
depends nss &&
depends freetype2 &&
+depends gperf &&
depends gyp &&
depends grit-i18n &&
depends SSL &&
@@ -18,7 +20,6 @@ depends glib2 &&
depends DEVICE-MANAGER &&
depends dbus &&
depends yasm &&
-depends ninja_build_system
depends RUBY
depends libxslt
depends fontconfig
diff --git a/qt5/qtwebengine/HISTORY b/qt5/qtwebengine/HISTORY
index e53e011..a5869c8 100644
--- a/qt5/qtwebengine/HISTORY
+++ b/qt5/qtwebengine/HISTORY
@@ -1,3 +1,8 @@
+2015-07-19 Treeve Jelbert <treeve AT sourcemage.org>
+ * DEPENDS: add qtwebchannel, gperf; delete ninja
+ * PRE_BUILD, jpeg.diff: added
+ * CONFLICTS: added
+
2015-07-02 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.5.0

diff --git a/qt5/qtwebengine/PRE_BUILD b/qt5/qtwebengine/PRE_BUILD
new file mode 100755
index 0000000..f4216ce
--- /dev/null
+++ b/qt5/qtwebengine/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY/src/3rdparty/chromium/ui/gfx/codec &&
+patch -p0 < $SPELL_DIRECTORY/jpeg.diff &&
+cd $SOURCE_DIRECTORY
diff --git a/qt5/qtwebengine/jpeg.diff b/qt5/qtwebengine/jpeg.diff
new file mode 100644
index 0000000..9c3af27
--- /dev/null
+++ b/qt5/qtwebengine/jpeg.diff
@@ -0,0 +1,49 @@
+--- jpeg_codec.cc.orig 2015-05-17 13:37:27.000000000 +0200
++++ jpeg_codec.cc 2015-05-17 13:38:36.000000000 +0200
+@@ -120,7 +120,7 @@
+ // tell libjpeg where to write the next data
+ cinfo->dest->next_output_byte = &(*state->out)[state->image_buffer_used];
+ cinfo->dest->free_in_buffer = state->out->size() -
state->image_buffer_used;
+- return 1;
++ return TRUE;
+ }
+
+ // Cleans up the JpegEncoderState to prepare for returning in the final
form.
+@@ -261,7 +261,7 @@
+ cinfo.data_precision = 8;
+
+ jpeg_set_defaults(&cinfo);
+- jpeg_set_quality(&cinfo, quality, 1); // quality here is 0-100
++ jpeg_set_quality(&cinfo, quality, TRUE); // quality here is 0-100
+
+ // set up the destination manager
+ jpeg_destination_mgr destmgr;
+@@ -273,7 +273,7 @@
+ JpegEncoderState state(output);
+ cinfo.client_data = &state;
+
+- jpeg_start_compress(&cinfo, 1);
++ jpeg_start_compress(&cinfo, TRUE);
+
+ // feed it the rows, doing necessary conversions for the color format
+ #ifdef JCS_EXTENSIONS
+@@ -359,7 +359,7 @@
+ // set to a positive value if TRUE is returned. A FALSE return should only
+ // be used when I/O suspension is desired."
+ boolean FillInputBuffer(j_decompress_ptr cinfo) {
+- return false;
++ return FALSE;
+ }
+
+ // Skip data in the buffer. Since we have all the data at once, this
operation
+@@ -487,8 +487,8 @@
+ cinfo.client_data = &state;
+
+ // fill the file metadata into our buffer
+- if (jpeg_read_header(&cinfo, true) != JPEG_HEADER_OK)
+- return false;
++ if (jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK)
++ return FALSE;
+
+ // we want to always get RGB data out
+ switch (cinfo.jpeg_color_space) {




Archive powered by MHonArc 2.6.24.

Top of Page