# HG changeset patch # User Antoine Bodin # Date 1297657658 -3600 # Node ID 84b620628dcf3faa9443382880737aef4b7fb3e1 # Parent 974788d401b69f28709032596250c7647fd86392 Remove: dillo-hg (older than 2.2) diff -r 974788d401b6 -r 84b620628dcf dillo-hg/receipt --- a/dillo-hg/receipt Mon Feb 14 05:13:18 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -# SliTaz package receipt. - -PACKAGE="dillo-hg" -VERSION="1326" -CATEGORY="network" -SHORT_DESC="Light and fast web browse using FLTK (Hg version)." -MAINTAINER="pankso@slitaz.org" -WEB_SITE="http://www.dillo.org/" -DEPENDS="fltk-2.0.x libpng jpeg zlib xorg-libXi xorg-libXinerama gcc-lib-base" -BUILD_DEPENDS="$DEPENDS fltk-2.0.x-dev libpng-dev jpeg-dev zlib-dev \ -python mercurial" -SUGGESTED="openssl" -CONFLICTS="dillo" -WGET_URL="mercurial|http://hg.dillo.org/dillo" -BRANCH="$VERSION" - -# Rules to configure and make the package. -compile_rules() -{ - cd $src - ./autogen.sh && - ./configure \ - --sysconfdir=/etc \ - --prefix=/usr \ - --enable-ssl \ - $CONFIGURE_ARGS && - make && - make DESTDIR=$PWD/_pkg install -} - -# Rules to gen a SliTaz package suitable for Tazpkg. -genpkg_rules() -{ - mkdir -p $fs/usr/lib \ - $fs/usr/share/applications \ - $fs/usr/share/pixmaps - cp -a $_pkg/usr/bin $fs/usr - cp -a $_pkg/usr/lib/dillo $fs/usr/lib - strip -s $fs/usr/lib/dillo/dpi/*/* - chmod +x $fs/usr/bin/* - # Config files with custom dillorc and desktop file. - cp -a $_pkg/etc $fs - cp stuff/dillorc $fs/etc/dillo - cp -a stuff/dillo.desktop $fs/usr/share/applications - cp -a stuff/dillo.png $fs/usr/share/pixmaps - # Webhome - cp -a stuff/webhome $fs/usr/share - chown -R root.root $fs -} - -pre_install() -{ - if [ -d $1/var/lib/tazpkg/installed/$CONFLICTS ]; then - echo "y" | tazpkg remove $CONFLICTS - fi -} diff -r 974788d401b6 -r 84b620628dcf dillo-hg/stuff/dillo.desktop --- a/dillo-hg/stuff/dillo.desktop Mon Feb 14 05:13:18 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -[Desktop Entry] -Name=Dillo Web Browser -Name[de]=Netznavigator Dillo -Name[fr]=Navigateur Web Dillo -Name[pt_PT]=Navegador Web Dillo -Name[zh_CN]=Dillo网页浏览器 -Type=Application -Categories=Network; -MimeType=text/html;application/xhtml+xml; -Exec=dillo %u -Icon=dillo.png diff -r 974788d401b6 -r 84b620628dcf dillo-hg/stuff/dillo.png Binary file dillo-hg/stuff/dillo.png has changed diff -r 974788d401b6 -r 84b620628dcf dillo-hg/stuff/dillorc --- a/dillo-hg/stuff/dillorc Mon Feb 14 05:13:18 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,228 +0,0 @@ -# dillorc -# Sample dillo initialization file. -# -# Lines that start with a '#' are comments. -# "#option=..." shows the built-in default. -# "# option=..." is an additional example. -# "option=..." overrides the built-in value. - -#------------------------------------------------------------------------- -# FIRST SECTION :) -#------------------------------------------------------------------------- - -# Set the desired initial browser size -# geometry=650x545+0+20 -#geometry=780x580 - -# Change this if you want to have text-only browsing from the start. -# (there's a toggle button near the bug meter to change this on-the-fly) -#load_images=YES - -# Change this if you want to disable loading of CSS stylesheets. -#load_stylesheets=YES - -# Change this if you want to disable parsing of embedded CSS. -#parse_embedded_css=YES - -# Change the buffering scheme for drawing -# 0 no double buffering - useful for debugging -# 1 light buffering using a single back buffer for all windows -# 2 full fltk-based double buffering for all windows -#buffered_drawing=1 - -# Set your default directory for download/save operations -#save_dir=/tmp - -#------------------------------------------------------------------------- -# RENDERING SECTION -#------------------------------------------------------------------------- - -# Fontnames: -# - some fonts may slow down rendering. -# - try to tune a fontname/font_factor combination. -# Ex. {helvetica, lucida, times, "new century schoolbook", utopia, ...} -# The values below represent the defaults. -# -#font_serif="DejaVu Serif" -#font_sans_serif="DejaVu Sans" -#font_cursive="DejaVu Sans" -#font_fantasy="DejaVu Sans" -#font_monospace="DejaVu Sans Mono" - -# All font sizes are scaled by this value -# font_factor=1.5 -#font_factor=1.0 - -# Maximum font size in pixels -#font_max_size=100 - -# Minimum font size in pixels -#font_min_size=6 - -# Show tooltip popup for images? -# Note: We use the "title" attribute and not "alt". -# More info at: http://bugzilla.mozilla.org/show_bug.cgi?id=25537 -# *** NOT HOOKED UP YET *** -# -#show_tooltip=YES - -# Set this to YES if you want to limit the word wrap width to the viewport -# width (may be useful for iPAQ) -# *** NOT HOOKED UP YET *** -# -#limit_text_width=NO - - -#------------------------------------------------------------------------- -# PARSING SECTION -#------------------------------------------------------------------------- - -# If you prefer more accurate HTML bug diagnosis over better rendering -# (page authors and webmasters) set the following to "NO". -# -#w3c_plus_heuristics=YES - - -#------------------------------------------------------------------------- -# NETWORK SECTION -#------------------------------------------------------------------------- - -# Set the start page. -# start_page="about:blank" -# start_page="http://www.dillo.org" -# start_page="file:/home/jcid/custom_page.html" -start_page="file:/usr/share/webhome/dillo.html" - -# Set the home location -# home="file:/home/jcid/HomePage/Home.html" -home="file:/usr/share/webhome/dillo.html" - -# Set the URL used by the web search dialog. -# "%s" is replaced with the search keywords separated by '+'. -# search_url="http://search.lycos.com/?query=%s" -# search_url="http://www.alltheweb.com/search?cat=web&query=%s" -#search_url="http://www.google.com/search?ie=UTF-8&oe=UTF-8&q=%s" - -# If set, dillo will ask web servers to send pages in this language. -# This setting does NOT change dillo's user interface. -# Format explained: www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4 -# Language-REGION values: www.iana.org/assignments/language-subtag-registry -# (by default, no Accept-Language header is sent) -# http_language="de" -# http_language="pt-BR" -# http_language="vi,de-CH,de;q=0.5,th;q=0.3" -http_language="en" - -# Set the proxy information for http. -# WARNING: - HTTPS does not currently use the proxy settings. -# - FTP and downloads plugins use wget. To use a proxy with them, -# you will need to configure wget accordingly. -# http_proxy="http://localhost:8080/" -#(by default, no proxy is used) - -# If you need to provide a user/password pair for the proxy, -# set the proxy user name here and Dillo will ask for the password later. -# http_proxyuser="joe" -#(by default, no proxy is used) - -# Set the domains to access without proxy -# no_proxy = ".hola.com .mynet.cl .hi.de" -#(by default, no proxy is used) - -# Set the HTTP Referer (sic) header. -# Note that there is no option to reveal the page that you came from because it -# would endanger your privacy. 'host' and 'path' allow you to pretend that the -# link you followed was on the same site that you're going to. -# none : Don't send any Referer header at all. -# host : Send the requested URI's hostname. -# path : Send the requested URI's host and path. -#http_referer=host - - -#------------------------------------------------------------------------- -# COLORS SECTION -#------------------------------------------------------------------------- - -# If your eyes suffer with white backgrounds, change this. -#allow_white_bg=YES - -# When set to YES, the page author's visited link color may be overridden -# to allow better contrast with text/links/background -#contrast_visited_color=YES - -#------------------------------------------------------------------------- -# USER INTERFACE SECTION -#------------------------------------------------------------------------- - -# Size of dillo panel (used to enlarge the browsing area) -# tiny : recommended for iPAQ (with small_icons) -# small : very nice! (it's "medium" without icon titles) -# medium : nice! -# large : Traditional -# panel_size=tiny -panel_size=small -# panel_size=medium -# panel_size=large - -#small_icons=NO - -# Here you can choose to hide some widgets of the dillo panel... -#show_back=YES -#show_forw=YES -#show_home=YES -#show_reload=YES -#show_save=YES -#show_stop=YES -#show_bookmarks=YES -#show_tools=YES -#show_filemenu=YES -#show_clear_url=YES -#show_url=YES -#show_search=YES -#show_progress_box=YES - -# Start dillo with the panels hidden? -#fullwindow_start=NO - -# When filling out forms, our default behaviour is to submit on enterpress, -# but only when there's a single text entry (to avoid incomplete submits). -# OTOH, if you have to fill out the same form repeatedly, you may find it -# useful to keep away from the mouse by forcing enter to submit. -#enterpress_forces_submit=NO - -# A mouse's middle click over a link opens a new Tab. -# If you prefer to open a new Window instead, set it to NO. -#middle_click_opens_new_tab=YES - -# Mouse middle click by default drives drag-scrolling. -# To paste an URL into the window instead of scrolling, set it to NO. -# Note: You could always paste the URL onto the URL box clear button. -#middle_click_drags_page=YES - -# Focus follows new Tabs. -# You can hold SHIFT to temporarily revert this behaviour. -#focus_new_tab=YES - - -#------------------------------------------------------------------------- -# DEBUG MESSAGES SECTION -#------------------------------------------------------------------------- - -# Soon we should add the "show_debug_messages=NO" option... - -# Generic messages (mainly for debugging specific parts) -# Change this to disable them. -#show_msg=YES - - -#------------------------------------------------------------------------- -# HTML BUG MESSAGES SECTION -#------------------------------------------------------------------------- - -# Accepted by the W3C validator but "strongly discouraged" by the SPEC. -# (Such as "TAB character inside 
").
-#show_extra_warnings=NO
-
-
-# -----------------------------------------------------------------------
-# dillorc ends here.
diff -r 974788d401b6 -r 84b620628dcf dillo-hg/stuff/webhome/dillo.css
--- a/dillo-hg/stuff/webhome/dillo.css	Mon Feb 14 05:13:18 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +0,0 @@
-/* 
-	CSS style for SliTaz GNU/Linux *book.
-	Pankso 2007 - www.slitaz.org
-*/
-
-body {
-	font: 13px sans-serif, vernada, arial;
-	background: #222222;
-	margin: 0;
-	padding-bottom: 100%;
-}
-
-#header {
-	background: #f0ba08;
-	color: black;
-	height: 50px;
-	border-top: 1px solid black;
-	border-bottom: 1px solid black;
-}
-#quicknav {
-	margin-right: 6px;
-	text-align: right;
-	font-size: 12px;
-	font-weight: bold;
-	margin-right: 6px;
-	}
-
-#quicknav a {
-	background: inherit;
-	color: white;
-	text-decoration: none;
-}
-
-#quicknav a:hover {
-	background: inherit;
-	color: #222222;
-}
-
-/*  content. */
-
-#content {
-	background: #ffffff;
-	color: black;
-	padding: 20px;
-	margin: 20px 50px 0px 50px;
-	width: auto;
-	text-align: justify;
-}
-
-#content li {
-	line-height: 1.5em;
-	text-align: left;
-}
-
-/* Legal informations */
-
-#copy {
-	font-size: 11px ;
-	text-align: center ;
-	background: transparent;
-	color: #ffffff;
-	padding-top: 20px;
-}
-
-#copy a {
-	background: inherit;
-	color: #a8a8a8;
-}
-
-#copy a:hover {
-	background: inherit;
-	color: #EDEDED;
-}
-
-/* Clouds */
-
-#cloud {
-	padding: 10px 80px 40px 80px;
-	line-height: 3em;
-	text-align: center;
-}
-#cloud a { padding: 4px; color: #956411; }
-#cloud a.tag1 { font-size: 0.7em; font-weight: 100; }
-#cloud a.tag2 { font-size: 0.8em; font-weight: 200; }
-#cloud a.tag3 { font-size: 0.9em; font-weight: 300; }
-#cloud a.tag4 { font-size: 1.0em; font-weight: 400; }
-#cloud a.tag5 { font-size: 1.2em; font-weight: 500; }
-#cloud a.tag6 { font-size: 1.4em; font-weight: 600; }
-#cloud a.tag7 { font-size: 1.6em; font-weight: 700; }
-#cloud a.tag8 { font-size: 1.8em; font-weight: 800; }
-#cloud a.tag9 { font-size: 2.2em; font-weight: 900; }
-#cloud a.tag10 { font-size: 2.5em; font-weight: 900; }
-
-/* General HTML entities for  content. */
-
-h1 {
-	margin: 0px 0px 0px 16px;
-}
-
-h2 {
-	margin: 12px 0;
-	color: #484B7C;
-	background: white;
-}
-
-h3 {
-	font-weight: bold;
-	color: #6c0023;
-	background: white;
-}
-
-a {
-	text-decoration: underline;
-}
-a:hover {
-	text-decoration: none;
-}
-
-pre {
-	padding: 5px;
-	color: black;
-	background: #e1e0b0;
-}
-pre.script {
-	padding: 10px;
-	color: black;
-	background: #e8e8e8;
-	border: 1px inset #333333;
-}
-
-code {
-	font-size: 12px;
-	color: #669900;
-	background: transparent;
-}
-
-li {
-	line-height: 1.4em;
-}
-
-hr {
-	border: 0pt none;
-}
diff -r 974788d401b6 -r 84b620628dcf dillo-hg/stuff/webhome/dillo.html
--- a/dillo-hg/stuff/webhome/dillo.html	Mon Feb 14 05:13:18 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-
-
-
-	SliTaz Dillo - Web Homepage
-	
-	
-	
-	
-
-
-
-
-
-
-
-

-

-
-

-
-	
-	
-		
-		
-	
-	
-	
-		
-		
-	
-
[ Wikipedia ]
-			

-				
-				
-				
-			

-		
[ Google ]
-			

-				
-				
-			

-		

-

-
-
-
-
-
-

-
-
-
diff -r 974788d401b6 -r 84b620628dcf enna/receipt
--- a/enna/receipt	Mon Feb 14 05:13:18 2011 +0100
+++ b/enna/receipt	Mon Feb 14 05:27:38 2011 +0100
@@ -1,16 +1,16 @@
 # SliTaz package receipt.
 
 PACKAGE="enna"
-VERSION="0.4.0"
+VERSION="0.4.1-20110214"
 CATEGORY="multimedia"
 SHORT_DESC="Enna media center."
 MAINTAINER="pankso@slitaz.org"
 DEPENDS="eet evas ecore edje emotion eina libplayer libvalhalla libelementary libcurl elementary efreet lirc libcddb edbus sqlite libtasn1"
 BUILD_DEPENDS="$DEPENDS eet-dev evas-dev ecore-dev edje-dev emotion-dev eina-dev \
-libplayer-dev libvalhalla-dev libelementary elementary-dev curl-dev"
-TARBALL="$PACKAGE-$VERSION.tar.bz2"
+libplayer-dev libvalhalla-dev libelementary elementary-dev curl-dev mercurial"
 WEB_SITE="http://enna.geexbox.org/"
-WGET_URL="http://enna.geexbox.org/releases/$TARBALL"
+WGET_URL="mercurial|http://hg.geexbox.org/enna"
+BRANCH="v${VERSION%%*-}"
 TAGS="images music video e17"
 
 # Rules to configure and make the package.
@@ -31,10 +31,3 @@
 	cp -a $_pkg/usr/bin $fs/usr
 	cp -a $_pkg/usr/share/enna $fs/usr/share
 }
-
-post_install()
-{
-	for f in $(find /usr/lib/ -name "*ver-svn-05*" ! -path */enlightenment/*); do 
-		ln -s $f $(echo $f|sed s/-05/-03/); 
-	done	
-}
diff -r 974788d401b6 -r 84b620628dcf fltk-2.0.x/receipt
--- a/fltk-2.0.x/receipt	Mon Feb 14 05:13:18 2011 +0100
+++ b/fltk-2.0.x/receipt	Mon Feb 14 05:27:38 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="fltk-2.0.x"
-VERSION="r6671"
+VERSION="r7725"
 CATEGORY="system-tools"
 SHORT_DESC="Fast Light Tool Kit (provide fluid)."
 MAINTAINER="pankso@slitaz.org"
@@ -17,7 +17,8 @@
 compile_rules()
 {
 	cd $src
-	patch -p 0 < ../stuff/filename_list-dirent.patch || exit 1
+	patch -p 0 < ../stuff/filename_list-dirent.patch || return 1
+	patch -Np1 < ../libpng14.patch || return 1
 	./configure \
 		--prefix=/usr \
 		--mandir=/usr/share/man \