Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (454ebfc1611006c723a499f3d16da1bfcd181809)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Vasil Yonkov (454ebfc1611006c723a499f3d16da1bfcd181809)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Vasil Yonkov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (454ebfc1611006c723a499f3d16da1bfcd181809)
  • Date: Sun, 4 Apr 2010 15:24:51 -0500
GIT changes to master grimoire by Vasil Yonkov <spirtbrat AT sourcemage.org>:

chat-im/ekiga/DEPENDS | 5 ----
chat-im/ekiga/HISTORY | 3 ++
gnome2-apps/gedit-plugins/BUILD | 38
++++---------------------------
gnome2-apps/gedit-plugins/CONFIGURE | 27 +++++++++++++---------
gnome2-apps/gedit-plugins/HISTORY | 3 ++
gnome2-apps/gnucash/DEPENDS | 2 -
gnome2-apps/gnucash/HISTORY | 3 ++
gnome2-libs/gnome-system-monitor/DEPENDS | 5 ----
gnome2-libs/gnome-system-monitor/HISTORY | 3 ++
gnome2-libs/goffice-dev/CONFLICTS | 3 ++
gnome2-libs/goffice-dev/DEPENDS | 13 +---------
gnome2-libs/goffice-dev/DETAILS | 4 +--
gnome2-libs/goffice-dev/HISTORY | 3 ++
gnome2-libs/goffice-dev/PRE_SUB_DEPENDS | 4 ---
gnome2-libs/goffice-dev/SUB_DEPENDS | 6 ----
gnome2-libs/goffice/CONFLICTS | 3 +-
gnome2-libs/goffice/DEPENDS | 13 +---------
gnome2-libs/goffice/HISTORY | 7 +++++
gnome2-libs/goffice/PRE_SUB_DEPENDS | 5 ----
gnome2-libs/goffice/SUB_DEPENDS | 6 ----
x11-libs/cairomm/DEPENDS | 4 +--
x11-libs/cairomm/HISTORY | 3 ++
22 files changed, 61 insertions(+), 102 deletions(-)

New commits:
commit 454ebfc1611006c723a499f3d16da1bfcd181809
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

goffice-dev: => 0.8.1

commit 8873e2f2dcf846d517eebef2403f62744ebcce12
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

goffice: depends on cairo with PS PDF SVG surfaces,
added dependency on gconf2,
removed PRE_SUB_DEPENDS, SUB_DEPENDS
added CONFLICTS

commit 950a6417649dfb408f0834aeeb71fda4f7b79c10
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

goffice: depends on cairo with PS PDF SVG surfaces,
added dependency on gconf2,
conflicts with goffice-dev

commit fad4c6542a284e6b731aaedfae28cf6010197cce
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

gnucash: removed goffice subdependency

commit 9f7ec464b626b302694d8295108eb768ad873d84
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

goffice: removed dependency on libart_lgpl, libgnomeui,
removed PRE_SUB_DEPENDS, SUB_DEPENDS - cairo is now a hard
dependency

commit da7f40eda977455f37cca4837a3181aad831392c
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

gnome-system-monitor: removed dependency on selinux

commit a5fab7407d6c57597cffde06ff9ebf942c58e1ae
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

gedit-plugins: rewritten plugins configuration

commit b1b4e0543d1fbefec180b8b972c389b058df5ea3
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

ekiga: removed sdl option - seems deprecated

commit 5ff1eb3dde07c1f1ae7e68251906913f4420c1a4
Author: Vasil Yonkov <spirtbrat AT sourcemage.org>
Commit: Vasil Yonkov <spirtbrat AT sourcemage.org>

cairomm: fixed documentation build option

diff --git a/chat-im/ekiga/DEPENDS b/chat-im/ekiga/DEPENDS
index 08c6539..be9c919 100755
--- a/chat-im/ekiga/DEPENDS
+++ b/chat-im/ekiga/DEPENDS
@@ -37,11 +37,6 @@ optional_depends "gnome-doc-utils" \
"--disable-gdu" \
"To build manual and documentation" &&

-optional_depends "sdl" \
- "" \
- "--disable-sdl" \
- "For full screen video" &&
-
optional_depends "arts" \
"" \
"" \
diff --git a/chat-im/ekiga/HISTORY b/chat-im/ekiga/HISTORY
index e32ef81..bee42a3 100644
--- a/chat-im/ekiga/HISTORY
+++ b/chat-im/ekiga/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed sdl option - seems deprecated
+
2009-09-25 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 3.2.6

diff --git a/gnome2-apps/gedit-plugins/BUILD b/gnome2-apps/gedit-plugins/BUILD
index 4745dbc..2e85d6d 100755
--- a/gnome2-apps/gedit-plugins/BUILD
+++ b/gnome2-apps/gedit-plugins/BUILD
@@ -1,34 +1,6 @@
-OPTS="${OPTS} --with-extensions="
-if [ "${GEDITPLUG_BRACKET}" == "y" ]; then
- OPTS="${OPTS}bracketcompletion,"
-fi &&
-if [ "${GEDITPLUG_CHARMAP}" == "y" ]; then
- OPTS="${OPTS}charmap,"
-fi &&
-if [ "${GEDITPLUG_CODECOMMENT}" == "y" ]; then
- OPTS="${OPTS}codecomment,"
-fi &&
-if [ "${GEDITPLUG_COLORPICKER}" == "y" ]; then
- OPTS="${OPTS}colorpicker,"
-fi &&
-if [ "${GEDITPLUG_DRAWSPACE}" == "y" ]; then
- OPTS="${OPTS}drawspaces,"
-fi &&
-if [ "${GEDITPLUG_JOINLINES}" == "y" ]; then
- OPTS="${OPTS}joinlines,"
-fi &&
-if [ "${GEDITPLUG_SESSAVE}" == "y" ]; then
- OPTS="${OPTS}sessionsaver,"
-fi &&
-if [ "${GEDITPLUG_SHOWTABBAR}" == "y" ]; then
- OPTS="${OPTS}showtabbar,"
-fi &&
-if [ "${GEDITPLUG_SMARTSPACES}" == "y" ]; then
- OPTS="${OPTS}smartspaces,"
-fi &&
-if [ "${GEDITPLUG_TERMINAL}" == "y" ]; then
- OPTS="${OPTS}terminal,"
-fi
-
+if [[ $GEDIT_PRESET == pick ]]; then
+ OPTS="--with-plugins=$GEDIT_PLUGINS $OPTS"
+else
+ OPTS="--with-plugins=$GEDIT_PRESET $OPTS"
+fi &&
default_build
-
diff --git a/gnome2-apps/gedit-plugins/CONFIGURE
b/gnome2-apps/gedit-plugins/CONFIGURE
index 77397f1..55a637c 100755
--- a/gnome2-apps/gedit-plugins/CONFIGURE
+++ b/gnome2-apps/gedit-plugins/CONFIGURE
@@ -1,10 +1,17 @@
-config_query GEDITPLUG_BRACKET "Build Bracketcompletion plugin?" y &&
-config_query GEDITPLUG_CHARMAP "Build Charmap plugin?" y &&
-config_query GEDITPLUG_CODECOMMENT "Build Codecomment plugin?" y &&
-config_query GEDITPLUG_COLORPICKER "Build Colorpicker plugin?" y &&
-config_query GEDITPLUG_DRAWSPACE "Build Drawspaces plugin?" y &&
-config_query GEDITPLUG_JOINLINES "Build Joinlines plugin?" y &&
-config_query GEDITPLUG_SESSAVE "Build Sessionsaver plugin?" y &&
-config_query GEDITPLUG_SHOWTABBAR "Build Showtabbar plugin?" y &&
-config_query GEDITPLUG_SMARTSPACES "Build Smartspaces plugin?" y &&
-config_query GEDITPLUG_TERMINAL "Build Terminal plugin?" y
+config_query_list GEDIT_PRESET \
+ "What extensions would you like to build?" \
+ default \
+ all \
+ really-all \
+ pick &&
+
+if [[ $GEDIT_PRESET == pick ]]; then
+ . $GRIMOIRE/config_query_multi.function &&
+ AVAILABLE_PLUGINS="bracketcompletion charmap codecomment colorpicker
+drawspaces joinlines multiedit showtabbar sessionsaver smartspaces
+terminal wordcompletion"
+ config_query_multi GEDIT_PLUGINS \
+ "What plugins would you like to build?" \
+ $AVAILABLE_PLUGINS &&
+ GEDIT_PLUGINS="${GEDIT_PLUGINS//\ /,}"
+fi
diff --git a/gnome2-apps/gedit-plugins/HISTORY
b/gnome2-apps/gedit-plugins/HISTORY
index 3107d4d..4fa5e4a 100644
--- a/gnome2-apps/gedit-plugins/HISTORY
+++ b/gnome2-apps/gedit-plugins/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * BUILD, CONFIGURE: rewritten plugins configuration
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.30.0

diff --git a/gnome2-apps/gnucash/DEPENDS b/gnome2-apps/gnucash/DEPENDS
index 3a866d5..46c148f 100755
--- a/gnome2-apps/gnucash/DEPENDS
+++ b/gnome2-apps/gnucash/DEPENDS
@@ -1,4 +1,4 @@
-depends -sub CAIRO goffice &&
+depends goffice &&
depends gtkhtml2 &&
depends guile &&
depends libart_lgpl &&
diff --git a/gnome2-apps/gnucash/HISTORY b/gnome2-apps/gnucash/HISTORY
index 40dff56..692eca6 100644
--- a/gnome2-apps/gnucash/HISTORY
+++ b/gnome2-apps/gnucash/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed goffice subdependency
+
2009-02-24 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 2.2.9. Fixed SOURCE_URL's
* DEPENDS: No long depends swig
diff --git a/gnome2-libs/gnome-system-monitor/DEPENDS
b/gnome2-libs/gnome-system-monitor/DEPENDS
index 8affa79..28cd887 100755
--- a/gnome2-libs/gnome-system-monitor/DEPENDS
+++ b/gnome2-libs/gnome-system-monitor/DEPENDS
@@ -10,11 +10,6 @@ depends gnome-icon-theme &&
depends glibmm &&
depends gtkmm2 &&

-optional_depends libselinux \
- "--enable-selinux" \
- "--disable-selinux" \
- "Enable SELinux support?" &&
-
optional_depends rarian \
"--enable-scrollkeeper" \
"--disable-scrollkeeper" \
diff --git a/gnome2-libs/gnome-system-monitor/HISTORY
b/gnome2-libs/gnome-system-monitor/HISTORY
index 2927ba7..e81f2fb 100644
--- a/gnome2-libs/gnome-system-monitor/HISTORY
+++ b/gnome2-libs/gnome-system-monitor/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: removed selinux
+
2010-03-31 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 2.28.1

diff --git a/gnome2-libs/goffice-dev/CONFLICTS
b/gnome2-libs/goffice-dev/CONFLICTS
new file mode 100755
index 0000000..2f323a4
--- /dev/null
+++ b/gnome2-libs/goffice-dev/CONFLICTS
@@ -0,0 +1,3 @@
+conflicts goffice-0.5 y &&
+conflicts goffice-0.6 y &&
+conflicts goffice
diff --git a/gnome2-libs/goffice-dev/DEPENDS b/gnome2-libs/goffice-dev/DEPENDS
index 02329e1..cc908ca 100755
--- a/gnome2-libs/goffice-dev/DEPENDS
+++ b/gnome2-libs/goffice-dev/DEPENDS
@@ -3,23 +3,14 @@ depends gconf2 &&
depends glib2 &&
depends libgsf &&
depends xml-parser-expat &&
-
-optional_depends -sub SVG cairo \
- '--with-cairo' \
- '--without-cairo' \
- 'for Cairo SVG support' &&
+depends -sub "PS PDF SVG" cairo &&

optional_depends gtk+2 \
"--with-gtk" \
"--without-gtk" \
"Build the UI?" &&

-optional_depends libgnomeui \
- "--with-gnome" \
- "--without-gnome" \
- "Use GNOME extensions?" &&
-
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
- "Build gtk-doc files?"
+ "Build gtk-doc files?"
diff --git a/gnome2-libs/goffice-dev/DETAILS b/gnome2-libs/goffice-dev/DETAILS
index b25bcd5..aa9a5ef 100755
--- a/gnome2-libs/goffice-dev/DETAILS
+++ b/gnome2-libs/goffice-dev/DETAILS
@@ -1,6 +1,6 @@
SPELL=goffice-dev
- VERSION=0.8.0
-
SOURCE_HASH=sha512:9bf1885170520b707208dd687b106e7c1ca016b8095a4ceb7449a2c9db49c2805fdcf893b5987491976a420c99069e2ff4ca524b68dec257529f1443101f8f4a
+ VERSION=0.8.1
+
SOURCE_HASH=sha512:6dc16f617637ed3aba877f5077b32b81a878ed19d70b5ea66a4c8a7069f37dce421c521501de401215e1aa6e2dd96511ceb7e1fb195c1a539bb7f0d463fee36f
BRANCH=${VERSION%\.*}
SOURCE=goffice-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/goffice-$VERSION
diff --git a/gnome2-libs/goffice-dev/HISTORY b/gnome2-libs/goffice-dev/HISTORY
index df678b1..194e90b 100644
--- a/gnome2-libs/goffice-dev/HISTORY
+++ b/gnome2-libs/goffice-dev/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DETAILS: updated spell to 0.8.1
+
2010-02-14 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated to version 0.8.0

diff --git a/gnome2-libs/goffice-dev/PRE_SUB_DEPENDS
b/gnome2-libs/goffice-dev/PRE_SUB_DEPENDS
deleted file mode 100755
index 30129e7..0000000
--- a/gnome2-libs/goffice-dev/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,4 +0,0 @@
-case $THIS_SUB_DEPENDS in
- CAIRO) is_depends_enabled $SPELL cairo && return 0;;
-esac
-return 1
diff --git a/gnome2-libs/goffice-dev/SUB_DEPENDS
b/gnome2-libs/goffice-dev/SUB_DEPENDS
deleted file mode 100755
index cc0159f..0000000
--- a/gnome2-libs/goffice-dev/SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
- CAIRO) echo "Cairo support requested: forcing cairo dependency."
- depends cairo '--with-cairo';;
- *) echo "Bogus sub_depends: $THIS_SUB_DEPENDS"
- return 1;;
-esac
diff --git a/gnome2-libs/goffice/CONFLICTS b/gnome2-libs/goffice/CONFLICTS
index 3b93106..3b1afdd 100755
--- a/gnome2-libs/goffice/CONFLICTS
+++ b/gnome2-libs/goffice/CONFLICTS
@@ -1,2 +1,3 @@
conflicts goffice-0.5 y &&
-conflicts goffice-0.6 y
+conflicts goffice-0.6 y &&
+conflicts goffice-dev
diff --git a/gnome2-libs/goffice/DEPENDS b/gnome2-libs/goffice/DEPENDS
index b086909..67899de 100755
--- a/gnome2-libs/goffice/DEPENDS
+++ b/gnome2-libs/goffice/DEPENDS
@@ -1,23 +1,14 @@
depends glib2 &&
depends libgsf &&
-depends libart_lgpl &&
depends xml-parser-expat &&
+depends -sub "PS PDF SVG" cairo &&
+depends gconf2 &&

optional_depends gtk+2 \
"--with-gtk" \
"--without-gtk" \
"build the UI?" &&

-optional_depends cairo \
- "--with-cairo" \
- "--without-cairo" \
- "for Cairo SVG support" &&
-
-optional_depends libgnomeui \
- "--with-gnome" \
- "--without-gnome" \
- "use GNOME extensions?" &&
-
optional_depends gtk-doc \
"--enable-gtk-doc" \
"--disable-gtk-doc" \
diff --git a/gnome2-libs/goffice/HISTORY b/gnome2-libs/goffice/HISTORY
index b34addc..d24e353 100644
--- a/gnome2-libs/goffice/HISTORY
+++ b/gnome2-libs/goffice/HISTORY
@@ -1,3 +1,10 @@
+2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * CONFLICTS: added goffice-dev
+ * DEPENDS: removed libart_lgpl, libgnomeui, made cairo a hard
+ dependency with PS PDF SVG surfaces,
+ added gconf2
+ * PRE_SUB_DEPENDS, SUB_DEPENDS: removed
+
2010-03-09 Vasil Yonkov <spirtbrat AT sourcemage.org>
* DETAILS: updated spell to 0.8.1
* DEPENDS: removed libglade2
diff --git a/gnome2-libs/goffice/PRE_SUB_DEPENDS
b/gnome2-libs/goffice/PRE_SUB_DEPENDS
deleted file mode 100755
index 653676c..0000000
--- a/gnome2-libs/goffice/PRE_SUB_DEPENDS
+++ /dev/null
@@ -1,5 +0,0 @@
-case $THIS_SUB_DEPENDS in
- CAIRO) is_depends_enabled $SPELL cairo;;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
- return 1;;
-esac
diff --git a/gnome2-libs/goffice/SUB_DEPENDS b/gnome2-libs/goffice/SUB_DEPENDS
deleted file mode 100755
index 0ff4fff..0000000
--- a/gnome2-libs/goffice/SUB_DEPENDS
+++ /dev/null
@@ -1,6 +0,0 @@
-case $THIS_SUB_DEPENDS in
- CAIRO) message "Cairo SVG support requested, forcing cairo dependency" &&
- depends cairo "--with-cairo";;
- *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
- return 1;;
-esac
diff --git a/x11-libs/cairomm/DEPENDS b/x11-libs/cairomm/DEPENDS
index 7d9ea30..a1e816e 100755
--- a/x11-libs/cairomm/DEPENDS
+++ b/x11-libs/cairomm/DEPENDS
@@ -2,6 +2,6 @@ depends g++ &&
depends cairo &&
depends libsigc++3 &&
optional_depends "doxygen" \
- "--enable-doc" \
- "--disable-doc" \
+ "--enable-documentation" \
+ "--disable-documentation" \
"Build documentation with doxygen"
diff --git a/x11-libs/cairomm/HISTORY b/x11-libs/cairomm/HISTORY
index b88ab4d..643a4d5 100644
--- a/x11-libs/cairomm/HISTORY
+++ b/x11-libs/cairomm/HISTORY
@@ -1,3 +1,6 @@
+2010-04-04 Vasil Yonkov <spirtbrat AT sourcemage.org>
+ * DEPENDS: fixed documentation build option
+
2010-02-20 Remko van der Vossen <wich AT sourcemage.org>
* DETAILS: 1.8.4



  • [SM-Commit] GIT changes to master grimoire by Vasil Yonkov (454ebfc1611006c723a499f3d16da1bfcd181809), Vasil Yonkov, 04/04/2010

Archive powered by MHonArc 2.6.24.

Top of Page