[cairo-commit] [cairo-www] 3 commits - ikiwiki.setup src/cairojava.mdwn src/cairomm.mdwn src/cairo-ocaml.mdwn src/documentation.mdwn src/examples.mdwn src/lists.mdwn src/rcairo.mdwn src/samples.mdwn src/summerofcode src/todo.mdwn

Nis Martensen nmartensen at freedesktop.org
Sun Apr 29 03:36:09 PDT 2012

 ikiwiki.setup               |    4 ++--
 src/cairo-ocaml.mdwn        |    2 +-
 src/cairojava.mdwn          |    7 -------
 src/cairomm.mdwn            |    3 ---
 src/documentation.mdwn      |    5 -----
 src/examples.mdwn           |    9 ---------
 src/lists.mdwn              |    2 +-
 src/rcairo.mdwn             |    2 +-
 src/samples.mdwn            |   15 +++------------
 src/summerofcode/ideas.mdwn |    3 ---
 src/todo.mdwn               |    4 ----
 11 files changed, 8 insertions(+), 48 deletions(-)

New commits:
commit 8aaf0c23b5fabd2220ed09e7ba18d76fca503856
Author: Nis Martensen <nis.martensen at web.de>
Date:   Sun Apr 29 12:30:42 2012 +0200

    java bindings: remove isolated cairojava page
    The cairojava page is not linked from anywhere and does not provide much
    information either. It basically only links to some CVS which does not
    exist any more.
    There is another java binding (cairo-java), which is also linked from
    the bindings page.
    So it seems safe to drop this page.

diff --git a/src/cairojava.mdwn b/src/cairojava.mdwn
deleted file mode 100644
index 73800bb..0000000
--- a/src/cairojava.mdwn
+++ /dev/null
@@ -1,7 +0,0 @@
-[[!meta title="Java bindings"]]
-Soorya Kuloor has implemented Java bindings to cairo to draw on SWT (versions >= 2.1) images and widgets using GTK+ 2.x.
-CairoJava doesn't appear to have been worked on in over 5 years.
-The source code was in the [CairoJava](http://cvs.cairographics.org/CairoJava) module in CVS. It was not ported to Git.
commit f05fa85031a631eed285f9ec0eb3b9e7e34621fa
Author: Nis Martensen <nis.martensen at web.de>
Date:   Sun Apr 29 12:25:34 2012 +0200

    remove broken links to old CVS repositories
    There is no cvs hosting on freedesktop.org/cairographics.org any more;
    all links are 404. Remove them where there is no obvious replacement.

diff --git a/src/cairo-ocaml.mdwn b/src/cairo-ocaml.mdwn
index 719332a..6c4c4bb 100644
--- a/src/cairo-ocaml.mdwn
+++ b/src/cairo-ocaml.mdwn
@@ -17,7 +17,7 @@ The following [[backends]] are supported:
   * svg
 There are also bindings for the SVG renderer
 # Releases
diff --git a/src/cairomm.mdwn b/src/cairomm.mdwn
index 43af98d..76c2c97 100644
--- a/src/cairomm.mdwn
+++ b/src/cairomm.mdwn
@@ -113,9 +113,6 @@ Freedesktop.org has some additional instructions on
    [gtkmm]:	http://gtkmm.org/
-   [cvs]:	http://freedesktop.org/wiki/UsingCvs
-   [viewcvs]:	http://webcvs.freedesktop.org/cairo/cairomm/
-   [examples]:	http://cvsweb.cairographics.org/cairomm/examples/
    [LGPL]:	http://www.gnu.org/licenses/lgpl.html
    [bugs]:	https://bugs.freedesktop.org/enter_bug.cgi?product=cairomm
    [open bugs]:	https://bugs.freedesktop.org/buglist.cgi?query_format=specific&order=relevance+desc&bug_status=__open__&product=cairomm&content=
diff --git a/src/documentation.mdwn b/src/documentation.mdwn
index 0dc0a9e..f5ebebf 100644
--- a/src/documentation.mdwn
+++ b/src/documentation.mdwn
@@ -92,10 +92,6 @@ Presentations about cairo
   * [Cairo: Making Graphics Easy to Print][9] by Carl Worth,
     presented at linux.conf.au in April 2005.
-  * [Custom widgets using GtkCairo (PDF)][10] by Øyvind Kolås,
-    presented at GUADEC in May 2004. Also see the excellent
-    [samples](/samples/) online from this tutorial.
   * [Xr: Cross-device Rendering for Vector Graphics][11] by Carl Worth
     and Keith Packard, presented at the Linux Symposium in July 2003.
     This is from before Xr was renamed to cairo.
@@ -109,7 +105,6 @@ Presentations about cairo
    [7]: http://people.freedesktop.org/~keithp/tutorials/cairo/cairo-tutorial.ps
    [8]: http://cworth.org/~cworth/papers/cairo_ddc2005/
    [9]: http://cworth.org/~cworth/papers/cairo_lca2005/
-   [10]: http://webcvs.freedesktop.org/cairo/papers/gtkcairo_guadec04/gtkcairo_guadec04.pdf?view=auto
    [11]: http://cworth.org/~cworth/papers/xr_ols2003/
    [12]: http://behdad.org/download/Presentations/cairo-code-community/slides.pdf
    [13]: http://zetcode.com/tutorials/cairographicstutorial/
diff --git a/src/examples.mdwn b/src/examples.mdwn
index ce9f32c..20d4184 100644
--- a/src/examples.mdwn
+++ b/src/examples.mdwn
@@ -20,11 +20,6 @@ object: [[!img "monkey.png" link="no"]]
 # Small demos
-There are a few small programs that may be useful for learning how to
-use cairo. We are collecting these in the
-[cairo-demo](http://webcvs.cairographics.org/cairo-demo/) module in CVS:
-	cvs -d :pserver:anoncvs at cvs.cairographics.org:/cvs/cairo co cairo-demo
 A simple pygtk
 [clock](http://www.ralph-glass.homepage.t-online.de/clock/readme.html) and a pygtk [shogiban](http://ralph-glass.homepage.t-online.de/shogi/readme.html) using svg to pixbuf rendering providing a GUI for gnushogi. [Xiangqiboard](http://xiangqiboard.blogspot.com) uses cairo via the Gtk2Hs Library for the Haskell programming language.
@@ -81,10 +76,6 @@ A quick demo showing how to use Cairo and XCB together.
   * The [SWT](http://www.eclipse.org/swt/) widget toolkit wraps cairo
     for its advanced graphics API on Linux as of version 3.1.
-  * Julien Boulnois has developed
-    [cairo-gtk-engine](http://webcvs.cairographics.org/cairo-gtk-engine/),
-    a flexible cairo-based theme engine for rendering GTK+ widgets.
   * [Papyrus][28] is a 2D canvas
     (scenegraph) library which renders using [[cairomm]] (and thus
     cairo). A companion library, papyrusgtk, provides a set of gtkmm
diff --git a/src/lists.mdwn b/src/lists.mdwn
index aa5d703..34d94bd 100644
--- a/src/lists.mdwn
+++ b/src/lists.mdwn
@@ -61,7 +61,7 @@ this may cause.
 	cairo-commit at cairographics.org 
-	Automated CVS commit messages of every change to the code of
+	Automated git commit messages of every change to the code of
 	cairo and related packages. Fairly high-traffic and only
 	interesting for people who don't mind seeing the ugly guts of
diff --git a/src/rcairo.mdwn b/src/rcairo.mdwn
index 8236616..5e79b7c 100644
--- a/src/rcairo.mdwn
+++ b/src/rcairo.mdwn
@@ -1,6 +1,6 @@
 [[!meta title="Ruby bindings"]]
-Ruby bindings for cairo are available at [GitHub](http://github.com/rcairo/rcairo) since 2010/08/21. The old repository is available in the cairo CVS, module [rcairo](http://webcvs.cairographics.org/rcairo).
+Ruby bindings for cairo are available at [GitHub](http://github.com/rcairo/rcairo) since 2010/08/21.
 # Install: RubyGems
diff --git a/src/samples.mdwn b/src/samples.mdwn
index 623915f..28c5815 100644
--- a/src/samples.mdwn
+++ b/src/samples.mdwn
@@ -4,20 +4,11 @@ This page contains samples of cairo's rendered output and the code
 snippets used to create them. The snippets are meant to be short, and
 easy to understand.
-[`cairo_snippets`][38], part of the cairo-demo module in cairo CVS, is
-used to create these webpages. `cairo_snippets` serves as a testbed for
-the rendered output of various cairo backends. The images rendered on
-these webpages are created by the `cairo_snippets_png` program, which is
-using cairo's software image backend.
-The snippet environment, and the original snippets were originally created
-by Øyvind Kolås for a paper submitted to [GUADEC 2004][39].
-All of his original snippet code is considered to be part of the public
+The original snippets were created by Øyvind Kolås for a paper submitted
+to [GUADEC 2004][39]. All of his original snippet code is considered to
+be part of the public domain.
 [[!inline pages="samples/* and !samples/*.png" show="0" template="cairo_sample" sort="title"]]
    [1]: http://cairographics.org/
-  [38]: http://cvs.cairographics.org/cairo-demo/cairo_snippets/
   [39]: http://2004.guadec.org/
diff --git a/src/summerofcode/ideas.mdwn b/src/summerofcode/ideas.mdwn
index eca1b11..2a05bce 100644
--- a/src/summerofcode/ideas.mdwn
+++ b/src/summerofcode/ideas.mdwn
@@ -186,9 +186,6 @@ Website improvements
 Cairo's website is run using ikiwiki.  See [here](http://cairographics.org/news/2007/07/03/cairo-wiki/)
 for more details about how to get the website source code.
- * [Easy] Integrate subset of [old cairo-demo programs](http://webcvs.cairographics.org/cairo-demo/) into the
-   wiki proper
  * [Easy] Integrate existing [reference manual](/manual) into the wiki proper
    Ideally the rest of the wiki would be able to write `cairo_create()` and have
diff --git a/src/todo.mdwn b/src/todo.mdwn
index 35ff632..23daaac 100644
--- a/src/todo.mdwn
+++ b/src/todo.mdwn
@@ -5,10 +5,6 @@ website and things to improve the cairo library itself.
 Website improvements
- * Integrate subset of [old cairo-demo
-   programs](http://webcvs.cairographics.org/cairo-demo/) into the
-   wiki proper
  * Integrate existing [reference manual](/manual) into the wiki proper and
    enable auto-updating from source code comments.
commit 79877f2f3eb87126e9d049cfb43b99a837a8a9db
Author: Nis Martensen <nis.martensen at web.de>
Date:   Sun Apr 29 11:33:22 2012 +0200

    wiki setup: disable action links in page footer
    All page editing via the web has been disabled for a long time now,
    since the wiki spam attacks last summer. The "edit" and "preferences"
    links at the bottom of each page have been dead since then; the "recent
    changes" link never worked at all.
    There are basically two ways to disable the "edit" and "preferences"
    links: One is to not provide a cgi-url in the setup file. This is suited
    when no cgi functionality is needed at all. The second is to disable the
    editpage plugin, which is the way to go when some other cgi
    functionality (e.g., page search) is still needed. In our case we do not
    build the cgi wrapper at all, so choose to comment out the cgi url.
    The "recent changes" link is disabled by deactivating the corresponding

diff --git a/ikiwiki.setup b/ikiwiki.setup
index b065d29..0e62957 100644
--- a/ikiwiki.setup
+++ b/ikiwiki.setup
@@ -40,7 +40,7 @@ use IkiWiki::Setup::Standard {
         # correctly before anything will work
 	destdir => "/srv/cairo.freedesktop.org/www",
 	url => "http://cairographics.org/",
-	cgiurl => "http://cairographics.org/ikiwiki",
+	#cgiurl => "http://cairographics.org/ikiwiki",
 	# And you'll likely want to customise these as well
 	wikiname => "cairographics.org",
@@ -113,7 +113,7 @@ use IkiWiki::Setup::Standard {
 	add_plugins => [qw{goodstuff pagetemplate}],
 	# If you want to disable any of the default plugins, list them here.
 	#disable_plugins => [qw{inline htmlscrubber passwordauth openid}],
-	disable_plugins => [qw{smiley}],
+	disable_plugins => [qw{smiley recentchanges}],
 	# For use with the tag plugin, make all tags be located under a
 	# base page.

More information about the cairo-commit mailing list