[devdocsgjs/wip/andyholmes/gnome-41: 3/5] Revert "Update for GNOME 41"




commit 09d6d7a10e2ed2c909f3bd07001d3a04af4ec826
Author: Andy Holmes <andrew g r holmes gmail com>
Date:   Fri Nov 19 16:00:51 2021 -0800

    Revert "Update for GNOME 41"
    
    This reverts commit 475c411f904779272a6022f489a712fb4699ecd8.

 Dockerfile                                         |    20 +-
 assets/javascripts/gnome_news.json                 |     4 -
 assets/stylesheets/global/_icons.scss              |     6 -
 lib/docs/scrapers/gnome/girs/mutter-8/Cally-8.gir  |  1128 -
 .../scrapers/gnome/girs/mutter-8/Clutter-8.gir     | 72892 -------------------
 .../scrapers/gnome/girs/mutter-8/ClutterX11-8.gir  |   315 -
 lib/docs/scrapers/gnome/girs/mutter-8/Cogl-8.gir   | 13813 ----
 .../scrapers/gnome/girs/mutter-8/CoglPango-8.gir   |   377 -
 lib/docs/scrapers/gnome/girs/mutter-8/Meta-8.gir   | 15958 ----
 9 files changed, 8 insertions(+), 104505 deletions(-)
---
diff --git a/Dockerfile b/Dockerfile
index 4e208340..596630bb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # We bump this each release to fetch the latest stable GIRs
-FROM fedora:35 AS fetch
+FROM fedora:34 AS fetch
 
 RUN dnf install -y \
         NetworkManager-libnm-devel cairo-devel cheese-libs-devel \
@@ -16,8 +16,7 @@ RUN dnf install -y \
         libgxps-devel libhandy1-devel libnotify-devel libpeas-devel \
         librsvg2-devel libsecret-devel libzapojit-devel mutter pango-devel \
         polkit-devel poppler-glib-devel rest-devel telepathy-glib-devel \
-        tracker-devel udisks-devel upower-devel vte{,291}-devel \
-        wireplumber-devel && \
+        tracker-devel udisks-devel upower-devel vte{,291}-devel && \
     dnf clean all && \
     rm -rf /var/cache/yum
 
@@ -28,7 +27,7 @@ FROM fedora:33 AS build
 # These are GIRs from the fetch step
 COPY --from=fetch /usr/share/gir-1.0 /usr/share/gir-1.0
 COPY --from=fetch /usr/share/gnome-shell /usr/share/gnome-shell
-COPY --from=fetch /usr/lib64/mutter-9 /usr/lib64/mutter-9
+COPY --from=fetch /usr/lib64/mutter-8 /usr/lib64/mutter-8
 
 # These are extra GIRs we can't install with dnf
 COPY lib/docs/scrapers/gnome/girs/GtkosxApplication-1.0.gir /usr/share/gir-1.0/
@@ -42,7 +41,6 @@ COPY lib/docs/scrapers/gnome/girs/mutter-4 /usr/lib64/mutter-4
 COPY lib/docs/scrapers/gnome/girs/mutter-5 /usr/lib64/mutter-5
 COPY lib/docs/scrapers/gnome/girs/mutter-6 /usr/lib64/mutter-6
 COPY lib/docs/scrapers/gnome/girs/mutter-7 /usr/lib64/mutter-7
-COPY lib/docs/scrapers/gnome/girs/mutter-8 /usr/lib64/mutter-8
 
 # Install devdocs dependencies
 RUN dnf install -y glibc-langpack-en
@@ -72,7 +70,6 @@ RUN bundle exec thor gir:generate_all /usr/lib64/mutter-5
 RUN bundle exec thor gir:generate_all /usr/lib64/mutter-6
 RUN bundle exec thor gir:generate_all /usr/lib64/mutter-7
 RUN bundle exec thor gir:generate_all /usr/lib64/mutter-8
-RUN bundle exec thor gir:generate_all /usr/lib64/mutter-9
 
 # Some of the gnome-shell GIRs need extra include paths
 RUN bundle exec thor gir:generate /usr/share/gnome-shell/Gvc-1.0.gir
@@ -85,9 +82,9 @@ RUN bundle exec thor gir:generate /usr/share/gnome-shell/St-1.0.gir --include /u
 # dbus10, dbusglib10, fontconfig20, freetype220, gdkpixdata20, gl10, libxml220,
 #   win3210, xfixes40, xft20, xlib20, xrandr13
 RUN for docset in appindicator301 appstreamglib10 atk10 atspi20 cairo10 \
-        cally10 cally9 camel12 champlain012 cheese30 clutter10 clutter9 \
-        cluttergdk10 cluttergst30 clutterx1110 clutterx119 cogl10 cogl20 cogl9 \
-        coglpango10 coglpango20 coglpango9 dbusmenu04 ebook12 ebookcontacts12 \
+        cally10 cally8 camel12 champlain012 cheese30 clutter10 clutter8 \
+        cluttergdk10 cluttergst30 clutterx1110 clutterx118 cogl10 cogl20 cogl8 \
+        coglpango10 coglpango20 coglpango8 dbusmenu04 ebook12 ebookcontacts12 \
         edataserver12 edataserverui12 evincedocument30 evinceview30 folks06 \
         folksdummy06 folkseds06 folkstelepathy06 gcab10 gck1 gcr3 gcrui3 \
         gda50 gdata00 gdesktopenums30 gdk20 gdk30 gdk40 gdkpixbuf20 gdkx1120 \
@@ -100,7 +97,7 @@ RUN for docset in appindicator301 appstreamglib10 atk10 atspi20 cairo10 \
         gstvideo10 gstvulkan10 gstwebrtc10 gtk20 gtk30 gtk40 gtkchamplain012 \
         gtkclutter10 gtkosxapplication10 gtksource30 gtksource40 gudev10 \
         gupnp10 gupnpdlna20 gupnpdlnagst20 gvc10 gweather30 gxps01 handy1 \
-        ibus10 javascriptcore40 json10 keybinder30 meta9 nm10 notify07 pango10 \
+        ibus10 javascriptcore40 json10 keybinder30 meta8 nm10 notify07 pango10 \
         pangocairo10 pangoft210 pangoxft10 peas10 peasgtk10 polkit10 \
         polkitagent10 poppler018 rest07 restextras07 rsvg20 secret1 shell01 \
         soup24 soupgnome24 st10 telepathyglib012 tracker20 tracker30 \
@@ -110,8 +107,7 @@ RUN for docset in appindicator301 appstreamglib10 atk10 atspi20 cairo10 \
         cally4 clutter4 clutterx114 cogl4 coglpango4 meta4 \
         cally5 clutter5 clutterx115 cogl5 coglpango5 meta5 \
         cally6 clutter6 clutterx116 cogl6 coglpango6 meta6 \
-        cally7 clutter7 clutterx117 cogl7 coglpango7 meta7 \
-        cally8 clutter8 clutterx118 cogl8 coglpango8 meta8; \
+        cally7 clutter7 clutterx117 cogl7 coglpango7 meta7; \
       do echo $docset; bundle exec thor docs:generate $docset --force; done
 
 
diff --git a/assets/javascripts/gnome_news.json b/assets/javascripts/gnome_news.json
index febd38fb..70d23dc7 100644
--- a/assets/javascripts/gnome_news.json
+++ b/assets/javascripts/gnome_news.json
@@ -1,8 +1,4 @@
 [
-  [
-    "2021-10-31",
-    "New documentations: <a href='/cally9/'>Cally 9</a> (Mutter version), <a href='/clutter9/'>Clutter 9</a> 
(Mutter version), <a href='/clutterx119/'>ClutterX11 9</a> (Mutter version), <a href='/cogl9/'>Cogl 9</a> 
(Mutter version), <a href='/coglpango9/'>CoglPango 9</a> (Mutter version), <a href='/meta9/'>Mutter 9</a>"
-  ],
   [
     "2021-09-05",
     "New documentations: <a href='/gtksource40/'>GtkSourceView 4</a>"
diff --git a/assets/stylesheets/global/_icons.scss b/assets/stylesheets/global/_icons.scss
index 057d0f91..8d6b9c74 100644
--- a/assets/stylesheets/global/_icons.scss
+++ b/assets/stylesheets/global/_icons.scss
@@ -208,7 +208,6 @@ convert public/icons/docs/{appstream,cairo,champlain,cheese,clutter,evince,evolu
 ._icon-cally6:before,
 ._icon-cally7:before,
 ._icon-cally8:before,
-._icon-cally9:before,
 ._icon-clutter10:before,
 ._icon-clutter3:before,
 ._icon-clutter4:before,
@@ -216,7 +215,6 @@ convert public/icons/docs/{appstream,cairo,champlain,cheese,clutter,evince,evolu
 ._icon-clutter6:before,
 ._icon-clutter7:before,
 ._icon-clutter8:before,
-._icon-clutter9:before,
 ._icon-cluttergdk10:before,
 ._icon-cluttergst20:before,
 ._icon-cluttergst30:before,
@@ -227,7 +225,6 @@ convert public/icons/docs/{appstream,cairo,champlain,cheese,clutter,evince,evolu
 ._icon-clutterx116:before,
 ._icon-clutterx117:before,
 ._icon-clutterx118:before,
-._icon-clutterx119:before,
 ._icon-cogl10:before,
 ._icon-cogl20:before,
 ._icon-cogl3:before,
@@ -236,7 +233,6 @@ convert public/icons/docs/{appstream,cairo,champlain,cheese,clutter,evince,evolu
 ._icon-cogl6:before,
 ._icon-cogl7:before,
 ._icon-cogl8:before,
-._icon-cogl9:before,
 ._icon-coglpango10:before,
 ._icon-coglpango20:before,
 ._icon-coglpango3:before,
@@ -245,7 +241,6 @@ convert public/icons/docs/{appstream,cairo,champlain,cheese,clutter,evince,evolu
 ._icon-coglpango6:before,
 ._icon-coglpango7:before,
 ._icon-coglpango8:before,
-._icon-coglpango9:before,
 ._icon-gtkclutter10:before { @extend %gnome-icons; background-position: -4rem 0; }
 ._icon-evincedocument30:before,
 ._icon-evinceview30:before { @extend %gnome-icons; background-position: -5rem 0; }
@@ -323,7 +318,6 @@ convert public/icons/docs/{appstream,cairo,champlain,cheese,clutter,evince,evolu
 ._icon-meta6:before,
 ._icon-meta7:before,
 ._icon-meta8:before,
-._icon-meta9:before,
 ._icon-notify07:before,
 ._icon-pango10:before,
 ._icon-pangocairo10:before,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]