Skip to content

Commit

Permalink
fix buildWithDependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@sideeffffect
sideeffffect committed Mar 28, 2024
1 parent 28409a3 commit f1d9164
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 26 deletions.
18 changes: 9 additions & 9 deletions adwaita/src/main/scala/generated/adwaita/functions.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -916,12 +916,12 @@ private[adwaita] object extern_functions:
/**
* [bindgen] header: /usr/include/libadwaita-1/adw-avatar.h
*/
def adw_avatar_draw_to_texture(self : Ptr[AdwAvatar], scale_factor : CInt): Ptr[_root_.gdk.all.GdkTexture] = extern
def adw_avatar_draw_to_texture(self : Ptr[AdwAvatar], scale_factor : CInt): Ptr[_root_.gtk.all.GdkTexture] = extern

/**
* [bindgen] header: /usr/include/libadwaita-1/adw-avatar.h
*/
def adw_avatar_get_custom_image(self : Ptr[AdwAvatar]): Ptr[_root_.gdk.all.GdkPaintable] = extern
def adw_avatar_get_custom_image(self : Ptr[AdwAvatar]): Ptr[_root_.gtk.all.GdkPaintable] = extern

/**
* [bindgen] header: /usr/include/libadwaita-1/adw-avatar.h
Expand Down Expand Up @@ -956,7 +956,7 @@ private[adwaita] object extern_functions:
/**
* [bindgen] header: /usr/include/libadwaita-1/adw-avatar.h
*/
def adw_avatar_set_custom_image(self : Ptr[AdwAvatar], custom_image : Ptr[_root_.gdk.all.GdkPaintable]): Unit = extern
def adw_avatar_set_custom_image(self : Ptr[AdwAvatar], custom_image : Ptr[_root_.gtk.all.GdkPaintable]): Unit = extern

/**
* [bindgen] header: /usr/include/libadwaita-1/adw-avatar.h
Expand Down Expand Up @@ -2636,7 +2636,7 @@ private[adwaita] object extern_functions:
/**
* [bindgen] header: /usr/include/libadwaita-1/adw-status-page.h
*/
def adw_status_page_get_paintable(self : Ptr[AdwStatusPage]): Ptr[_root_.gdk.all.GdkPaintable] = extern
def adw_status_page_get_paintable(self : Ptr[AdwStatusPage]): Ptr[_root_.gtk.all.GdkPaintable] = extern

/**
* [bindgen] header: /usr/include/libadwaita-1/adw-status-page.h
Expand Down Expand Up @@ -2671,7 +2671,7 @@ private[adwaita] object extern_functions:
/**
* [bindgen] header: /usr/include/libadwaita-1/adw-status-page.h
*/
def adw_status_page_set_paintable(self : Ptr[AdwStatusPage], paintable : Ptr[_root_.gdk.all.GdkPaintable]): Unit = extern
def adw_status_page_set_paintable(self : Ptr[AdwStatusPage], paintable : Ptr[_root_.gtk.all.GdkPaintable]): Unit = extern

/**
* [bindgen] header: /usr/include/libadwaita-1/adw-status-page.h
Expand All @@ -2696,12 +2696,12 @@ private[adwaita] object extern_functions:
/**
* [bindgen] header: /usr/include/libadwaita-1/adw-style-manager.h
*/
def adw_style_manager_get_display(self : Ptr[AdwStyleManager]): Ptr[_root_.gdk.all.GdkDisplay] = extern
def adw_style_manager_get_display(self : Ptr[AdwStyleManager]): Ptr[_root_.gtk.all.GdkDisplay] = extern

/**
* [bindgen] header: /usr/include/libadwaita-1/adw-style-manager.h
*/
def adw_style_manager_get_for_display(display : Ptr[_root_.gdk.all.GdkDisplay]): Ptr[AdwStyleManager] = extern
def adw_style_manager_get_for_display(display : Ptr[_root_.gtk.all.GdkDisplay]): Ptr[AdwStyleManager] = extern

/**
* [bindgen] header: /usr/include/libadwaita-1/adw-style-manager.h
Expand Down Expand Up @@ -2806,7 +2806,7 @@ private[adwaita] object extern_functions:
/**
* [bindgen] header: /usr/include/libadwaita-1/adw-swipeable.h
*/
def adw_swipeable_get_swipe_area(self : Ptr[AdwSwipeable], navigation_direction : AdwNavigationDirection, is_drag : _root_.glib.all.gboolean, rect : Ptr[_root_.gdk.all.GdkRectangle]): Unit = extern
def adw_swipeable_get_swipe_area(self : Ptr[AdwSwipeable], navigation_direction : AdwNavigationDirection, is_drag : _root_.glib.all.gboolean, rect : Ptr[_root_.gtk.all.GdkRectangle]): Unit = extern

/**
* [bindgen] header: /usr/include/libadwaita-1/adw-swipeable.h
Expand Down Expand Up @@ -2896,7 +2896,7 @@ private[adwaita] object extern_functions:
/**
* [bindgen] header: /usr/include/libadwaita-1/adw-tab-bar.h
*/
def adw_tab_bar_setup_extra_drop_target(self : Ptr[AdwTabBar], actions : _root_.gdk.all.GdkDragAction, types : Ptr[_root_.gobject.all.GType], n_types : _root_.glib.all.gsize): Unit = extern
def adw_tab_bar_setup_extra_drop_target(self : Ptr[AdwTabBar], actions : _root_.gtk.all.GdkDragAction, types : Ptr[_root_.gobject.all.GType], n_types : _root_.glib.all.gsize): Unit = extern

/**
* [bindgen] header: /usr/include/libadwaita-1/adw-tab-view.h
Expand Down
16 changes: 8 additions & 8 deletions adwaita/src/main/scala/generated/adwaita/structs.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -883,7 +883,7 @@ opaque type AdwSwipeableInterface = CArray[CChar, Nat.Digit2[Nat._8, Nat._8]]
object AdwSwipeableInterface:
given _tag: Tag[AdwSwipeableInterface] = Tag.CArray[CChar, Nat.Digit2[Nat._8, Nat._8]](Tag.Byte, Tag.Digit2[Nat._8, Nat._8](Tag.Nat8, Tag.Nat8))
def apply()(using Zone): Ptr[AdwSwipeableInterface] = scala.scalanative.unsafe.alloc[AdwSwipeableInterface](1)
def apply(parent : _root_.gobject.all.GTypeInterface, get_distance : CFuncPtr1[Ptr[AdwSwipeable], Double], get_snap_points : CFuncPtr2[Ptr[AdwSwipeable], Ptr[CInt], Ptr[Double]], get_progress : CFuncPtr1[Ptr[AdwSwipeable], Double], get_cancel_progress : CFuncPtr1[Ptr[AdwSwipeable], Double], get_swipe_area : CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gdk.all.GdkRectangle], Unit], padding : CArray[_root_.glib.all.gpointer, Nat._4])(using Zone): Ptr[AdwSwipeableInterface] =
def apply(parent : _root_.gobject.all.GTypeInterface, get_distance : CFuncPtr1[Ptr[AdwSwipeable], Double], get_snap_points : CFuncPtr2[Ptr[AdwSwipeable], Ptr[CInt], Ptr[Double]], get_progress : CFuncPtr1[Ptr[AdwSwipeable], Double], get_cancel_progress : CFuncPtr1[Ptr[AdwSwipeable], Double], get_swipe_area : CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gtk.all.GdkRectangle], Unit], padding : CArray[_root_.glib.all.gpointer, Nat._4])(using Zone): Ptr[AdwSwipeableInterface] =
val ____ptr = apply()
(!____ptr).parent = parent
(!____ptr).get_distance = get_distance
Expand All @@ -904,8 +904,8 @@ object AdwSwipeableInterface:
def get_progress_=(value: CFuncPtr1[Ptr[AdwSwipeable], Double]): Unit = !struct.at(32).asInstanceOf[Ptr[CFuncPtr1[Ptr[AdwSwipeable], Double]]] = value
def get_cancel_progress: CFuncPtr1[Ptr[AdwSwipeable], Double] = !struct.at(40).asInstanceOf[Ptr[CFuncPtr1[Ptr[AdwSwipeable], Double]]]
def get_cancel_progress_=(value: CFuncPtr1[Ptr[AdwSwipeable], Double]): Unit = !struct.at(40).asInstanceOf[Ptr[CFuncPtr1[Ptr[AdwSwipeable], Double]]] = value
def get_swipe_area: CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gdk.all.GdkRectangle], Unit] = !struct.at(48).asInstanceOf[Ptr[CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gdk.all.GdkRectangle], Unit]]]
def get_swipe_area_=(value: CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gdk.all.GdkRectangle], Unit]): Unit = !struct.at(48).asInstanceOf[Ptr[CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gdk.all.GdkRectangle], Unit]]] = value
def get_swipe_area: CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gtk.all.GdkRectangle], Unit] = !struct.at(48).asInstanceOf[Ptr[CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gtk.all.GdkRectangle], Unit]]]
def get_swipe_area_=(value: CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gtk.all.GdkRectangle], Unit]): Unit = !struct.at(48).asInstanceOf[Ptr[CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gtk.all.GdkRectangle], Unit]]] = value
def padding: CArray[_root_.glib.all.gpointer, Nat._4] = !struct.at(56).asInstanceOf[Ptr[CArray[_root_.glib.all.gpointer, Nat._4]]]
def padding_=(value: CArray[_root_.glib.all.gpointer, Nat._4]): Unit = !struct.at(56).asInstanceOf[Ptr[CArray[_root_.glib.all.gpointer, Nat._4]]] = value

Expand Down Expand Up @@ -1767,11 +1767,11 @@ object _AdwSwipeable:
* [bindgen] header: /usr/include/libadwaita-1/adw-swipeable.h
*/
opaque type _AdwSwipeableInterface = CStruct7[_root_.gobject.all.GTypeInterface, CFuncPtr1[Ptr[AdwSwipeable], Double], CFuncPtr2[Ptr[AdwSwipeable], Ptr[CInt], Ptr[Double]], CFuncPtr1[Ptr[AdwSwipeable], Double], CFuncPtr1[Ptr[AdwSwipeable], Double], CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gdk.all.GdkRectangle], Unit], CArray[_root_.glib.all.gpointer, Nat._4]]
opaque type _AdwSwipeableInterface = CStruct7[_root_.gobject.all.GTypeInterface, CFuncPtr1[Ptr[AdwSwipeable], Double], CFuncPtr2[Ptr[AdwSwipeable], Ptr[CInt], Ptr[Double]], CFuncPtr1[Ptr[AdwSwipeable], Double], CFuncPtr1[Ptr[AdwSwipeable], Double], CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gtk.all.GdkRectangle], Unit], CArray[_root_.glib.all.gpointer, Nat._4]]
object _AdwSwipeableInterface:
given _tag: Tag[_AdwSwipeableInterface] = Tag.materializeCStruct7Tag[_root_.gobject.all.GTypeInterface, CFuncPtr1[Ptr[AdwSwipeable], Double], CFuncPtr2[Ptr[AdwSwipeable], Ptr[CInt], Ptr[Double]], CFuncPtr1[Ptr[AdwSwipeable], Double], CFuncPtr1[Ptr[AdwSwipeable], Double], CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gdk.all.GdkRectangle], Unit], CArray[_root_.glib.all.gpointer, Nat._4]]
given _tag: Tag[_AdwSwipeableInterface] = Tag.materializeCStruct7Tag[_root_.gobject.all.GTypeInterface, CFuncPtr1[Ptr[AdwSwipeable], Double], CFuncPtr2[Ptr[AdwSwipeable], Ptr[CInt], Ptr[Double]], CFuncPtr1[Ptr[AdwSwipeable], Double], CFuncPtr1[Ptr[AdwSwipeable], Double], CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gtk.all.GdkRectangle], Unit], CArray[_root_.glib.all.gpointer, Nat._4]]
def apply()(using Zone): Ptr[_AdwSwipeableInterface] = scala.scalanative.unsafe.alloc[_AdwSwipeableInterface](1)
def apply(parent : _root_.gobject.all.GTypeInterface, get_distance : CFuncPtr1[Ptr[AdwSwipeable], Double], get_snap_points : CFuncPtr2[Ptr[AdwSwipeable], Ptr[CInt], Ptr[Double]], get_progress : CFuncPtr1[Ptr[AdwSwipeable], Double], get_cancel_progress : CFuncPtr1[Ptr[AdwSwipeable], Double], get_swipe_area : CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gdk.all.GdkRectangle], Unit], padding : CArray[_root_.glib.all.gpointer, Nat._4])(using Zone): Ptr[_AdwSwipeableInterface] =
def apply(parent : _root_.gobject.all.GTypeInterface, get_distance : CFuncPtr1[Ptr[AdwSwipeable], Double], get_snap_points : CFuncPtr2[Ptr[AdwSwipeable], Ptr[CInt], Ptr[Double]], get_progress : CFuncPtr1[Ptr[AdwSwipeable], Double], get_cancel_progress : CFuncPtr1[Ptr[AdwSwipeable], Double], get_swipe_area : CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gtk.all.GdkRectangle], Unit], padding : CArray[_root_.glib.all.gpointer, Nat._4])(using Zone): Ptr[_AdwSwipeableInterface] =
val ____ptr = apply()
(!____ptr).parent = parent
(!____ptr).get_distance = get_distance
Expand All @@ -1792,8 +1792,8 @@ object _AdwSwipeableInterface:
def get_progress_=(value: CFuncPtr1[Ptr[AdwSwipeable], Double]): Unit = !struct.at4 = value
def get_cancel_progress : CFuncPtr1[Ptr[AdwSwipeable], Double] = struct._5
def get_cancel_progress_=(value: CFuncPtr1[Ptr[AdwSwipeable], Double]): Unit = !struct.at5 = value
def get_swipe_area : CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gdk.all.GdkRectangle], Unit] = struct._6
def get_swipe_area_=(value: CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gdk.all.GdkRectangle], Unit]): Unit = !struct.at6 = value
def get_swipe_area : CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gtk.all.GdkRectangle], Unit] = struct._6
def get_swipe_area_=(value: CFuncPtr4[Ptr[AdwSwipeable], AdwNavigationDirection, _root_.glib.all.gboolean, Ptr[_root_.gtk.all.GdkRectangle], Unit]): Unit = !struct.at6 = value
def padding : CArray[_root_.glib.all.gpointer, Nat._4] = struct._7
def padding_=(value: CArray[_root_.glib.all.gpointer, Nat._4]): Unit = !struct.at7 = value

Expand Down
17 changes: 8 additions & 9 deletions build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,10 @@ lazy val adwaita = project
.settings(
bindgenBindings +=
buildWithDependencies(
"gdk",
"gio",
"glib",
"gobject",
"graphene",
"gsk",
"gtk",
"libcairo",
"libharfbuzz",
Expand All @@ -88,8 +86,6 @@ lazy val adwaita = project
.addCImport("adwaita.h")
.withOpaqueStructs(Set("G*", "Adw*"))
.withMultiFile(true)
.addExternalPath("*/graphene-1.0/*", "libgraphene")
.addExternalPath("*/pango-1.0/*", "libpango")
.addExternalPath("*/gdk-pixbuf-2.0/*", "libgdkpixbuf")
}
)
Expand Down Expand Up @@ -395,11 +391,14 @@ def buildWithDependencies(deps: String*)(bb: Binding.Builder) = {
case "libcairo" =>
List("*/cairo/*")
case "libharfbuzz" => List("*/harfbuzz/*")
case "gtk" => List("*/gtk-4.0/gtk/*")
case "gdk" => List("*/gtk-4.0/gdk/*")
case "graphene" => List("*/graphene-1.0/*")
case "gsk" => List("*/gtk-4.0/gsk/*")
case "pango" => List("*/pango-1.0/*")
case "gtk" =>
List(
"*/gtk-4.0/gdk/*",
"*/gtk-4.0/gsk/*",
"*/gtk-4.0/gtk/*"
)
case "graphene" => List("*/graphene-1.0/*")
case "pango" => List("*/pango-1.0/*")
}

val externals =
Expand Down

0 comments on commit f1d9164

Please sign in to comment.