Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update with eoan's gir-files #138

Merged
merged 1 commit into from Jul 3, 2019
Merged

Conversation

@EPashkin
Copy link
Member

EPashkin commented Jun 8, 2019

Application of gtk-rs/gir-files#37

IMHO this better wait until we finish current release

@EPashkin

This comment has been minimized.

Copy link
Member Author

EPashkin commented Jun 8, 2019

At minimum, this diff caused a build error, so Gir needs to be fixed

#[repr(C)]
#[derive(Copy, Clone)]
pub struct GTestLogMsg {
    pub log_type: GTestLogType,
    pub n_strings: c_uint,
    pub strings: *mut *mut c_char,
    pub n_nums: c_uint,
-    pub nums: *mut c_long,
+    _truncated_record_marker: c_void,
+    // /*Unimplemented*/*mut long double
}

from this GLib-2.0.gir change

@@ -23571,11 +24778,12 @@ zero then @fixture will be equal to @user_data.</doc>
      <field name="n_nums" writable="1">
        <type name="guint" c:type="guint"/>
      </field>
-      <field name="nums" writable="1">
-        <type name="glong" c:type="long*"/>
+      <field name="nums" introspectable="0" writable="1">
+        <type name="long double" c:type="long double*"/>
      </field>
@GuillaumeGomez

This comment has been minimized.

Copy link
Member

GuillaumeGomez commented Jun 29, 2019

Seems like gdk-sys was not correctly generated.

@EPashkin

This comment has been minimized.

Copy link
Member Author

EPashkin commented Jun 29, 2019

@GuillaumeGomez Why do you think so?
Almost all changes in Gdk-3.0.gir are <doc xml:space="preserve" filename="gdk/gdkapplaunchcontext.c" line="236"> or <source-position filename="gdk/gdkproperty.h" line="59"/>

@GuillaumeGomez

This comment has been minimized.

Copy link
Member

GuillaumeGomez commented Jun 29, 2019

The CI. :)

@EPashkin

This comment has been minimized.

Copy link
Member Author

EPashkin commented Jun 29, 2019

Is normal that regen_check fail, PR don't have gir/gir-files changes

@EPashkin EPashkin force-pushed the EPashkin:ubuntu_eoan branch from d30006a to 229a018 Jun 29, 2019
@EPashkin EPashkin changed the title WIP: Update with eoan's gir-files Update with eoan's gir-files Jun 29, 2019
@EPashkin

This comment has been minimized.

Copy link
Member Author

EPashkin commented Jun 29, 2019

Merged gir's PR and updated this

@sdroege

This comment has been minimized.

Copy link
Member

sdroege commented Jul 1, 2019

Looks good to me, now only needs regens and enabling of all the new API in the other crates

@EPashkin

This comment has been minimized.

Copy link
Member Author

EPashkin commented Jul 3, 2019

I can't start "regens and enabling of all the new API in the other crates" until this merged 😉

@GuillaumeGomez

This comment has been minimized.

Copy link
Member

GuillaumeGomez commented Jul 3, 2019

Thanks!

@GuillaumeGomez GuillaumeGomez merged commit 0279993 into gtk-rs:master Jul 3, 2019
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@EPashkin EPashkin deleted the EPashkin:ubuntu_eoan branch Jul 3, 2019
@sdroege

This comment has been minimized.

Copy link
Member

sdroege commented Jul 4, 2019

I can't start "regens and enabling of all the new API in the other crates" until this merged wink

Sure, I meant once this is merged :) You take care of that?

@@ -1305,7 +1305,7 @@ impl ::std::fmt::Debug for GtkBindingArg_d {
#[repr(C)]
#[derive(Copy, Clone)]
pub union GtkTextAppearance_u1 {
pub rgba: [*mut gdk::GdkRGBA; 2],
pub rgba: *mut [*mut gdk::GdkRGBA; 2],

This comment has been minimized.

Copy link
@sdroege

sdroege Dec 15, 2019

Member

This was wrong

@@ -13545,7 +13568,7 @@ impl ::std::fmt::Debug for GtkRangeAccessible {
pub struct GtkRcStyle {
pub parent_instance: gobject::GObject,
pub name: *mut c_char,
pub bg_pixmap_name: [*mut c_char; 5],
pub bg_pixmap_name: *mut [*mut c_char; 5],

This comment has been minimized.

Copy link
@sdroege

sdroege Dec 15, 2019

Member

And this

@@ -14162,8 +14186,14 @@ pub struct GtkStyle {
pub font_desc: *mut pango::PangoFontDescription,
pub xthickness: c_int,
pub ythickness: c_int,
_truncated_record_marker: c_void,
// /*Ignored*/field background has incomplete type
pub background: *mut [*mut cairo::cairo_pattern_t; 5],

This comment has been minimized.

Copy link
@sdroege

sdroege Dec 15, 2019

Member

This too

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
3 participants
You can’t perform that action at this time.