[SM-Commit] GIT changes to master grimoire by George Sherwood (c3b109ca3166dc822cda34df19924db6e5a7131e)

Ladislav Hagara ladislav.hagara at unob.cz
Wed Aug 18 02:36:07 EDT 2010


> GIT changes to master grimoire by George Sherwood <gsherwood at sourcemage.org>:
> 
>  ChangeLog                                  |    1 
>  x11-toolkits/gtk+3/BUILD                   |    3 +
>  x11-toolkits/gtk+3/DEPENDS                 |   45 +++++++++++++++++++++++++++++
>  x11-toolkits/gtk+3/DETAILS                 |   24 +++++++++++++++
>  x11-toolkits/gtk+3/HISTORY                 |    2 +
>  x11-toolkits/gtk+3/INSTALL                 |    3 +
>  x11-toolkits/gtk+3/PREPARE                 |    1 
>  x11-toolkits/gtk+3/PRE_SUB_DEPENDS         |    5 +++
>  x11-toolkits/gtk+3/PROVIDES                |    1 
>  x11-toolkits/gtk+3/SUB_DEPENDS             |    6 +++
>  x11-toolkits/gtk+3/gtk+-2.90.6.tar.bz2.sig |binary
>  11 files changed, 91 insertions(+)
> 
> New commits:
> commit c3b109ca3166dc822cda34df19924db6e5a7131e
> Author: George Sherwood <gsherwood at sourcemage.org>
> Commit: George Sherwood <gsherwood at sourcemage.org>
> 
>     gtk+3: New spell for the brave.  Installs side by side with the
>     devel version of gtk+2 only.  Not sure what else it does, but will
>     be useful when branching off new gnome update
> 
> diff --git a/ChangeLog b/ChangeLog
> index 226e762..14c7c29 100644
> --- a/ChangeLog
> +++ b/ChangeLog
> @@ -1,5 +1,6 @@
>  2010-08-17 George Sherwood <gsherwood at sourcemage.org>
>  	* gnome2-libs/gdk-pixbuf2: new spell for devel gtk+3
> +	* x11-toolkits/gtk+3: new spell with latest gtk toolkit
>  
>  2010-08-16 Finn Haedicke <finn at sourcemage.org>
>  	* net/network-manager: new spell, network connection daemon
> diff --git a/x11-toolkits/gtk+3/BUILD b/x11-toolkits/gtk+3/BUILD
> new file mode 100755
> index 0000000..02c1e81
> --- /dev/null
> +++ b/x11-toolkits/gtk+3/BUILD
> @@ -0,0 +1,3 @@
> +# bug #12668
> +export CFLAGS="${CFLAGS/-O3/-Os}"                    &&
> +default_build
> diff --git a/x11-toolkits/gtk+3/DEPENDS b/x11-toolkits/gtk+3/DEPENDS
> new file mode 100755
> index 0000000..79bcc47
> --- /dev/null
> +++ b/x11-toolkits/gtk+3/DEPENDS
> @@ -0,0 +1,45 @@
> +depends -sub GLIB_DEVEL glib2 &&
> +depends gdk-pixbuf2
> +depends -sub GOBJ_DEVEL gobject-introspection
> +depends atk &&
> +depends pango &&
> +depends -sub "CAIRO_DEVEL PDF PS SVG X" cairo &&
> +depends libsm &&
> +depends libxext &&
> +depends libxcursor &&
> +depends libxrender &&
> +
> +optional_depends libxinerama \
> +                 "--enable-xinerama" \
> +                 "--disable-xinerama" \
> +                 "for X11 Xinerama extension support" &&
> +
> +optional_depends libxrandr                            \
> +                 ""                                   \
> +                 ""                                   \
> +                 "for X11 Resize and Rotate support"  &&
> +
> +optional_depends libxcomposite                  \
> +                 ""                             \
> +                 ""                             \
> +                 "for X11 Compositing support"  &&
> +
> +optional_depends libxdamage                                  \
> +                 ""                                          \
> +                 ""                                          \
> +                 "for X11 Damaged region extension support"  &&
> +
> +optional_depends libxfixes                                      \
> +                 ""                                             \
> +                 ""                                             \
> +                 "for X11 workarounds for various limitations"  &&
> +
> +optional_depends gtk-doc \
> +                 "--enable-gtk-doc" \
> +                 "--disable-gtk-doc" \
> +                 "Build documentation with gtk-doc" &&
> +
> +optional_depends cups \
> +                 "--enable-cups" \
> +                 "--disable-cups" \
> +                 "Enable CUPS print backend support?"
> diff --git a/x11-toolkits/gtk+3/DETAILS b/x11-toolkits/gtk+3/DETAILS
> new file mode 100755
> index 0000000..f0889e6
> --- /dev/null
> +++ b/x11-toolkits/gtk+3/DETAILS
> @@ -0,0 +1,24 @@
> +           SPELL=gtk+3
> +if [[ $GTK_VER == devel ]];then
> +         VERSION=2.90.6
> +#     SOURCE_HASH=sha512:a6c45ab25a5cf07c665f808a96b83a91bf0e8218f793806f1e05d664aeea4838957868ccbc13b45e9be1fdbadc6a7f294ec111f7d6d00bb09cf59fa4fe4eecc3
> +          SOURCE=gtk+-$VERSION.tar.bz2
> +      SOURCE_GPG=gurus.gpg:$SOURCE.sig
> +else
> +         VERSION=2.90.6
> +          SOURCE=gtk+-$VERSION.tar.bz2
> +      SOURCE_GPG=gurus.gpg:$SOURCE.sig
> +fi
> +          BRANCH=`echo $VERSION | cut -d . -f 1,2`
> +SOURCE_DIRECTORY="$BUILD_DIRECTORY/gtk+-$VERSION"
> +   SOURCE_URL[0]=$GNOME_URL/sources/gtk+/$BRANCH/$SOURCE
> +      LICENSE[0]=LGPL
> +        KEYWORDS="x11 libs"
> +           DOCS="ChangeLog COPYING NEW README* docs/*.txt docs/faq docs/tutorial"
> +        WEB_SITE=http://www.gtk.org/
> +         ENTERED=20100817
> +           SHORT="highly usable, feature rich toolkit for creating GUIs"
> +cat << EOF
> +GTK+ is a widget toolkit for X and other windowing systems. It is used in such
> +projects as the GIMP and GNOME.
> +EOF
> diff --git a/x11-toolkits/gtk+3/HISTORY b/x11-toolkits/gtk+3/HISTORY
> new file mode 100644
> index 0000000..54b1677
> --- /dev/null
> +++ b/x11-toolkits/gtk+3/HISTORY
> @@ -0,0 +1,2 @@
> +2010-08-17 George Sherwood <gsherwood at sourcemage.org>
> +	* ALL: Created spell
> diff --git a/x11-toolkits/gtk+3/INSTALL b/x11-toolkits/gtk+3/INSTALL
> new file mode 100755
> index 0000000..4ee9c45
> --- /dev/null
> +++ b/x11-toolkits/gtk+3/INSTALL
> @@ -0,0 +1,3 @@
> +default_install &&
> +install -vm 755 -d "$INSTALL_ROOT/etc/gtk-3.0" &&
> +gdk-pixbuf-query-loaders > "$INSTALL_ROOT/etc/gtk-3.0/gdk-pixbuf.loaders"
> diff --git a/x11-toolkits/gtk+3/PREPARE b/x11-toolkits/gtk+3/PREPARE
> new file mode 100755
> index 0000000..03347b9
> --- /dev/null
> +++ b/x11-toolkits/gtk+3/PREPARE
> @@ -0,0 +1 @@
> +config_query_list GTK_VER 'which gtk version?' stable devel
> diff --git a/x11-toolkits/gtk+3/PRE_SUB_DEPENDS b/x11-toolkits/gtk+3/PRE_SUB_DEPENDS
> new file mode 100755
> index 0000000..988b1f9
> --- /dev/null
> +++ b/x11-toolkits/gtk+3/PRE_SUB_DEPENDS
> @@ -0,0 +1,5 @@
> +case $THIS_SUB_DEPENDS in
> +  PNG) is_depends_enabled $SPELL libpng   && return 0;;
> +  *) echo "Eek, unknown subdependency requested!"; return 1;;
> +esac
> +return 1
> diff --git a/x11-toolkits/gtk+3/PROVIDES b/x11-toolkits/gtk+3/PROVIDES
> new file mode 100755
> index 0000000..6c0fe0d
> --- /dev/null
> +++ b/x11-toolkits/gtk+3/PROVIDES
> @@ -0,0 +1 @@
> +GTK2
> diff --git a/x11-toolkits/gtk+3/SUB_DEPENDS b/x11-toolkits/gtk+3/SUB_DEPENDS
> new file mode 100755
> index 0000000..9cc6a0c
> --- /dev/null
> +++ b/x11-toolkits/gtk+3/SUB_DEPENDS
> @@ -0,0 +1,6 @@
> +case $THIS_SUB_DEPENDS in
> +PNG) echo "PNG support requested, forcing libpng dependency." &&
> +     depends libpng



PNG subdepends? You don't have libpng in DEPENDS. Moreover in your devel
gtk+2 commit you wrote that pictures are now in gdk-pixbuf2.

-- 
Ladislav Hagara



More information about the SM-Commit mailing list